refactor: Remove IAttributeType usage from ArtifactQuery

Change-Id: I54fa3e57939f0201683d8af53972d290cae117be

3 files changed, 14 insertions, 13 deletions

diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/ArtifactSearch_V1Test.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/ArtifactSearch_V1Test.java
index ca991d49d4a..531c484223b 100644
--- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/ArtifactSearch_V1Test.java
+++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/ArtifactSearch_V1Test.java
@@ -14,9 +14,10 @@ import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON;
 import static org.mockito.Mockito.when;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import javax.ws.rs.core.Request;
 import javax.ws.rs.core.UriInfo;
-import org.eclipse.osee.framework.core.data.IAttributeType;
+import org.eclipse.osee.framework.core.data.AttributeTypeId;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.orcs.OrcsApi;
 import org.eclipse.osee.orcs.rest.internal.search.artifact.ArtifactSearch_V1;
@@ -48,7 +49,7 @@ public class ArtifactSearch_V1Test {
    @Mock private Request request;
    // @formatter:on
 
-   private final java.util.List<String> types = Arrays.asList("1000000000000070");
+   private final List<String> types = Arrays.asList("1000000000000070");
    private ArtifactSearch_V1 search;
 
    @Before
@@ -62,14 +63,14 @@ public class ArtifactSearch_V1Test {
       when(orcsApi.getQueryFactory()).thenReturn(queryFactory);
       when(queryFactory.fromBranch(COMMON)).thenReturn(builder);
 
-      Collection<IAttributeType> attrTypes = PredicateHandlerUtil.getIAttributeTypes(types);
+      Collection<AttributeTypeId> attributeTypes = PredicateHandlerUtil.getAttributeTypes(types);
       Predicate predicate = new Predicate(SearchMethod.ATTRIBUTE_TYPE, types, Arrays.asList("AtsAdmin"));
-      when(builder.and(attrTypes, predicate.getValues().iterator().next(), predicate.getOptions())).thenReturn(builder);
+      when(builder.and(attributeTypes, predicate.getValues().iterator().next(), predicate.getOptions())).thenReturn(
+         builder);
 
       SearchRequest params = new SearchRequest(COMMON, Arrays.asList(predicate), null, 0, false);
       SearchResponse response = search.getSearchWithMatrixParams(params);
 
       Assert.assertEquals(response.getSearchRequest(), params);
    }
-
-}
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/AttributeTypePredicateHandlerTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/AttributeTypePredicateHandlerTest.java
index 09dc2a494ba..d8f7d08cd97 100644
--- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/AttributeTypePredicateHandlerTest.java
+++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/AttributeTypePredicateHandlerTest.java
@@ -16,7 +16,7 @@ import static org.mockito.Mockito.verify;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import org.eclipse.osee.framework.core.data.IAttributeType;
+import org.eclipse.osee.framework.core.data.AttributeTypeId;
 import org.eclipse.osee.framework.core.enums.QueryOption;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.orcs.rest.internal.search.artifact.predicate.AttributeTypePredicateHandler;
@@ -55,7 +55,7 @@ public class AttributeTypePredicateHandlerTest {
       Predicate testPredicate =
          new Predicate(SearchMethod.ATTRIBUTE_TYPE, typeParameters, values, QueryOption.TOKEN_DELIMITER__ANY);
       handler.handle(builder, testPredicate);
-      verify(builder).and(anyCollectionOf(IAttributeType.class), eq("value"), eq(QueryOption.TOKEN_DELIMITER__ANY));
+      verify(builder).and(anyCollectionOf(AttributeTypeId.class), eq("value"), eq(QueryOption.TOKEN_DELIMITER__ANY));
    }
 
 }
diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistenceTypePredicateHandlerTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistenceTypePredicateHandlerTest.java
index 7eca68d149f..91ffb5fc17a 100644
--- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistenceTypePredicateHandlerTest.java
+++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistenceTypePredicateHandlerTest.java
@@ -21,7 +21,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import org.eclipse.osee.framework.core.data.IAttributeType;
+import org.eclipse.osee.framework.core.data.AttributeTypeId;
 import org.eclipse.osee.framework.core.data.IRelationType;
 import org.eclipse.osee.framework.core.data.RelationTypeSide;
 import org.eclipse.osee.framework.core.enums.QueryOption;
@@ -49,7 +49,7 @@ public class ExistenceTypePredicateHandlerTest {
    @Captor
    private ArgumentCaptor<IRelationType> relationTypeCaptor;
    @Captor
-   private ArgumentCaptor<Collection<IAttributeType>> attrTypeSideCaptor;
+   private ArgumentCaptor<Collection<AttributeTypeId>> attrTypeSideCaptor;
 
    @Before
    public void initialize() {
@@ -117,7 +117,7 @@ public class ExistenceTypePredicateHandlerTest {
       handler.handle(builder, testPredicate);
       verify(builder).andExists(attrTypeSideCaptor.capture());
       Assert.assertEquals(1, attrTypeSideCaptor.getAllValues().size());
-      List<IAttributeType> attrTypes = new ArrayList<>(attrTypeSideCaptor.getValue());
+      List<AttributeTypeId> attrTypes = new ArrayList<>(attrTypeSideCaptor.getValue());
       Assert.assertEquals(attrTypes.get(0), Long.valueOf(attrUuid));
    }
 
@@ -134,7 +134,7 @@ public class ExistenceTypePredicateHandlerTest {
 
       verify(builder).andExists(attrTypeSideCaptor.capture());
       Assert.assertEquals(1, attrTypeSideCaptor.getAllValues().size());
-      Iterator<IAttributeType> iterator = attrTypeSideCaptor.getValue().iterator();
+      Iterator<AttributeTypeId> iterator = attrTypeSideCaptor.getValue().iterator();
       Assert.assertEquals(iterator.next(), Long.valueOf(attrType1));
       Assert.assertEquals(iterator.next(), Long.valueOf(attrType2));
    }
@@ -148,7 +148,7 @@ public class ExistenceTypePredicateHandlerTest {
       Predicate testPredicate =
          new Predicate(SearchMethod.EXISTS_TYPE, typeParameters, values, QueryOption.TOKEN_DELIMITER__ANY);
       handler.handle(builder, testPredicate);
-      verify(builder, never()).andExists(anyCollectionOf(IAttributeType.class));
+      verify(builder, never()).andExists(anyCollectionOf(AttributeTypeId.class));
 
       value = "12A4G";
       typeParameters = Collections.singletonList("relType");