refactor: Use ArtifactEndpoint id loading in ArtifactQuery more

Change-Id: Ia90193a402330bf19321f15924b39ea6e8aad622

1 files changed, 9 insertions, 6 deletions

diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java
index 13fc94a9d09..9a6dd7dce09 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java
@@ -223,8 +223,8 @@ public class ArtifactQuery {
    }
 
    public static List<ArtifactId> getArtifactIdsFromTypeAndName(ArtifactTypeId artifactType, String artifactName, BranchId branch) {
-      return new ArtifactQueryBuilder(artifactType, branch, ALL,
-         new AttributeCriteria(CoreAttributeTypes.Name, artifactName)).selectArtifacts(2);
+      return getArtifactEndpoint(branch).getArtifactIdsByAttribute(CoreAttributeTypes.Name, artifactName, true,
+         artifactType);
    }
 
    /**
@@ -262,8 +262,10 @@ public class ArtifactQuery {
    }
 
    private static Artifact getArtifactFromTypeAndAttribute(ArtifactTypeId artifactType, AttributeTypeId attributeType, String attributeValue, BranchId branch, QueryType queryType) {
-      return new ArtifactQueryBuilder(artifactType, branch, ALL,
-         new AttributeCriteria(attributeType, attributeValue)).getOrCheckArtifact(queryType);
+      List<Artifact> artifacts = getArtifactListFrom(
+         getArtifactEndpoint(branch).getArtifactIdsByAttribute(attributeType, attributeValue, true, artifactType),
+         branch);
+      return getOrCheckArtifact(queryType, artifacts);
    }
 
    public static List<Artifact> getArtifactListFromTypeAndName(ArtifactTypeId artifactType, String artifactName, BranchId branch) {
@@ -271,8 +273,9 @@ public class ArtifactQuery {
    }
 
    public static List<Artifact> getArtifactListFromTypeAndAttribute(ArtifactTypeId artifactType, AttributeTypeId attributeType, String attributeValue, BranchId branch) {
-      return new ArtifactQueryBuilder(artifactType, branch, ALL,
-         new AttributeCriteria(attributeType, attributeValue)).getArtifacts(100, null);
+      return getArtifactListFrom(
+         getArtifactEndpoint(branch).getArtifactIdsByAttribute(attributeType, attributeValue, true, artifactType),
+         branch);
    }
 
    /**