bug[ats_B32Z0]: Fix ArtifactEvent to take branch guid

Change-Id: I34f5ec4baba3aadfdb6f32a871400a316a9de89f

3 files changed, 34 insertions, 36 deletions

diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java
index 6d33daa9d18..9c60d3c45a7 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java
@@ -34,7 +34,6 @@ import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteTransactionChan
 import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteTransactionEvent1;
 import org.eclipse.osee.framework.skynet.core.User;
 import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
 import org.eclipse.osee.framework.skynet.core.event.model.AccessControlEvent;
 import org.eclipse.osee.framework.skynet.core.event.model.AccessControlEventType;
 import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent;
@@ -221,42 +220,37 @@ public final class FrameworkEventUtil {
    }
 
    public static ArtifactEvent getPersistEvent(RemotePersistEvent1 remEvent) {
-      try {
-         ArtifactEvent event = new ArtifactEvent(BranchManager.getBranchByGuid(remEvent.getBranchGuid()));
-         event.setNetworkSender(getNetworkSender(remEvent.getNetworkSender()));
-         event.setTransactionId(remEvent.getTransactionId());
-         for (RemoteBasicGuidArtifact1 remGuidArt : remEvent.getArtifacts()) {
-            EventModType modType = EventModType.getType(remGuidArt.getModTypeGuid());
-            // This can happen if new events are added that old releases don't handle
-            if (modType == null) {
-               OseeLog.logf(Activator.class, Level.WARNING, "Unhandled remote artifact [%s]", remGuidArt);
-            } else {
-               if (modType == EventModType.Modified) {
-                  event.getArtifacts().add(getEventModifiedBasicGuidArtifact(modType, remGuidArt));
-               } else if (modType == EventModType.ChangeType) {
-                  event.getArtifacts().add(getEventChangeTypeBasicGuidArtifact(modType, remGuidArt));
-               } else {
-                  event.getArtifacts().add(getEventBasicGuidArtifact(modType, remGuidArt));
-               }
-            }
-         }
-         for (RemoteBasicGuidRelation1 guidRel : remEvent.getRelations()) {
-            EventBasicGuidRelation relEvent = getEventBasicGuidRelation(guidRel);
-            // This can happen if new events are added that old releases don't handle
-            if (relEvent == null) {
-               OseeLog.logf(Activator.class, Level.WARNING, "Unhandled remote relation [%s]", guidRel);
+      ArtifactEvent event = new ArtifactEvent(remEvent.getBranchGuid());
+      event.setNetworkSender(getNetworkSender(remEvent.getNetworkSender()));
+      event.setTransactionId(remEvent.getTransactionId());
+      for (RemoteBasicGuidArtifact1 remGuidArt : remEvent.getArtifacts()) {
+         EventModType modType = EventModType.getType(remGuidArt.getModTypeGuid());
+         // This can happen if new events are added that old releases don't handle
+         if (modType == null) {
+            OseeLog.logf(Activator.class, Level.WARNING, "Unhandled remote artifact [%s]", remGuidArt);
+         } else {
+            if (modType == EventModType.Modified) {
+               event.getArtifacts().add(getEventModifiedBasicGuidArtifact(modType, remGuidArt));
+            } else if (modType == EventModType.ChangeType) {
+               event.getArtifacts().add(getEventChangeTypeBasicGuidArtifact(modType, remGuidArt));
             } else {
-               event.getRelations().add(relEvent);
+               event.getArtifacts().add(getEventBasicGuidArtifact(modType, remGuidArt));
             }
          }
-         for (RemoteBasicGuidRelationReorder1 guidReorder : remEvent.getRelationReorders()) {
-            event.getRelationOrderRecords().add(getDefaultBasicGuidRelationReorder(guidReorder));
+      }
+      for (RemoteBasicGuidRelation1 guidRel : remEvent.getRelations()) {
+         EventBasicGuidRelation relEvent = getEventBasicGuidRelation(guidRel);
+         // This can happen if new events are added that old releases don't handle
+         if (relEvent == null) {
+            OseeLog.logf(Activator.class, Level.WARNING, "Unhandled remote relation [%s]", guidRel);
+         } else {
+            event.getRelations().add(relEvent);
          }
-         return event;
-      } catch (OseeCoreException ex) {
-         OseeLog.log(Activator.class, Level.SEVERE, "Can't convert event", ex);
       }
-      return null;
+      for (RemoteBasicGuidRelationReorder1 guidReorder : remEvent.getRelationReorders()) {
+         event.getRelationOrderRecords().add(getDefaultBasicGuidRelationReorder(guidReorder));
+      }
+      return event;
    }
 
    public static DefaultBasicGuidRelationReorder getDefaultBasicGuidRelationReorder(RemoteBasicGuidRelationReorder1 guidRelOrder) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java
index 1a73220b59d..db746092c52 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java
@@ -140,7 +140,7 @@ public final class OseeEventManager {
          return;
       }
       ArtifactEvent artifactEvent =
-         new ArtifactEvent(artifacts.iterator().next().getBranch(), ArtifactEventType.RELOAD_ARTIFACTS);
+         new ArtifactEvent(artifacts.iterator().next().getBranch().getGuid(), ArtifactEventType.RELOAD_ARTIFACTS);
       artifactEvent.getArtifacts().addAll(EventBasicGuidArtifact.get(EventModType.Reloaded, artifacts));
       getEventService().send(source, artifactEvent);
    }
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEvent.java
index abd9dffb908..927ee316e6f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEvent.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEvent.java
@@ -48,12 +48,16 @@ public class ArtifactEvent implements FrameworkEvent, HasNetworkSender {
    private final ArtifactEventType reloadEvent;
 
    public ArtifactEvent(IOseeBranch branch) {
-      this(branch, ArtifactEventType.UPDATE_ARTIFACTS);
+      this(branch.getGuid());
    }
 
-   public ArtifactEvent(IOseeBranch branch, ArtifactEventType reloadEvent) {
+   public ArtifactEvent(String branchGuid) {
+      this(branchGuid, ArtifactEventType.UPDATE_ARTIFACTS);
+   }
+
+   public ArtifactEvent(String branchGuid, ArtifactEventType reloadEvent) {
       this.reloadEvent = reloadEvent;
-      branchGuid = branch.getGuid();
+      this.branchGuid = branchGuid;
    }
 
    public boolean isReloadEvent() {