refactor[ats_10SNH]: Remove unnecessary calls to ArtifactCache

2 files changed, 6 insertions, 14 deletions

diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsCacheManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsCacheManager.java
index fd942d7a227..b102498c9a3 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsCacheManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsCacheManager.java
@@ -14,7 +14,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import org.eclipse.osee.ats.core.client.config.ActionableItemArtifact;
 import org.eclipse.osee.ats.core.client.config.AtsBulkLoad;
 import org.eclipse.osee.ats.core.client.config.TeamDefinitionArtifact;
 import org.eclipse.osee.ats.core.client.internal.Activator;
@@ -28,6 +27,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
+import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
 
 /**
  * Common cache storage for ATS configuration artifacts:<br>
@@ -88,14 +88,10 @@ public class AtsCacheManager {
       return ArtifactCache.getArtifactsByName(artifactType, name);
    }
 
-   public static ActionableItemArtifact getActionableItemByGuid(String guid) throws OseeCoreException {
-      AtsBulkLoad.loadConfig(true);
-      return (ActionableItemArtifact) ArtifactCache.getActive(guid, AtsUtilCore.getAtsBranch().getId());
-   }
-
    public static TeamDefinitionArtifact getTeamDefinitionArtifact(String guid) throws OseeCoreException {
       AtsBulkLoad.loadConfig(true);
-      return (TeamDefinitionArtifact) ArtifactCache.getActive(guid, AtsUtilCore.getAtsBranch().getId());
+      //AtsBulkLoad should load the artifact into the cache and ArtifactQuery should return the cached artifact
+      return (TeamDefinitionArtifact) ArtifactQuery.getArtifactFromId(guid, AtsUtilCore.getAtsBranch());
    }
 
    public static List<Artifact> getArtifactsByActive(IArtifactType artifactType, Active active) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/ActionableItemManagerCore.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/ActionableItemManagerCore.java
index 23ae5898bc2..d3044f2407a 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/ActionableItemManagerCore.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/ActionableItemManagerCore.java
@@ -33,7 +33,7 @@ import org.eclipse.osee.framework.core.util.Result;
 import org.eclipse.osee.framework.jdk.core.util.Collections;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
+import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
 import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
 
 /**
@@ -52,12 +52,8 @@ public class ActionableItemManagerCore {
       for (String guid : getActionableItemGuids()) {
          try {
             ActionableItemArtifact aia =
-               (ActionableItemArtifact) ArtifactCache.getActive(guid, AtsUtilCore.getAtsBranch());
-            if (aia == null) {
-               OseeLog.log(Activator.class, Level.SEVERE, "Can't find Actionable Item for guid " + guid);
-            } else {
-               ais.add(aia);
-            }
+               (ActionableItemArtifact) ArtifactQuery.getArtifactFromId(guid, AtsUtilCore.getAtsBranch());
+            ais.add(aia);
          } catch (OseeCoreException ex) {
             OseeLog.log(Activator.class, Level.SEVERE, "Error getting actionable item for guid " + guid, ex);
          }