refactor: Extend IAttributeType from AttributeTypeToken

Change-Id: I6b876f6c8f1688c8136288b41a655e8c75db5f8f

3 files changed, 7 insertions, 9 deletions

diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java
index f0531983484..a79804fabb3 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java
@@ -215,7 +215,7 @@ public class DataFactoryImplTest {
    public void testCreateAttributeData() throws OseeCoreException {
       IAttributeType attributeType = mock(IAttributeType.class);
 
-      when(attributeType.getGuid()).thenReturn(2389L);
+      when(attributeType.getId()).thenReturn(2389L);
       when(proxyFactory.createProxy(2389L, "", "")).thenReturn(otherDataProxy);
       when(otherDataProxy.getData()).thenReturn(new Object[] {2389L, "", ""});
 
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImplTest.java
index 3c1089abbbb..a136f344b5c 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImplTest.java
@@ -295,8 +295,7 @@ public class DataLoaderFactoryImplTest {
 
       dataLoader.load(cancellation, builder);
 
-      verifyCommon(EXPECTED_HEAD_TX, expectedLoadLevel, EXCLUDE_DELETED, expected,
-         CoreAttributeTypes.Annotation.getGuid());
+      verifyCommon(EXPECTED_HEAD_TX, expectedLoadLevel, EXCLUDE_DELETED, expected, CoreAttributeTypes.Annotation);
    }
 
    @Test
@@ -322,7 +321,7 @@ public class DataLoaderFactoryImplTest {
       dataLoader.load(cancellation, builder);
 
       verifyCommon(EXPECTED_HEAD_TX, expectedLoadLevel, EXCLUDE_DELETED, expected, data(JQID),
-         list(data(CoreAttributeTypes.Annotation.getGuid(), CoreAttributeTypes.Category.getGuid())));
+         list(data(CoreAttributeTypes.Annotation, CoreAttributeTypes.Category)));
    }
 
    @Test
@@ -399,7 +398,7 @@ public class DataLoaderFactoryImplTest {
       dataLoader.load(cancellation, builder);
 
       verifyCommon(EXPECTED_HEAD_TX, expectedLoadLevel, EXCLUDE_DELETED, expected, data(JQID, JQID),
-         list(data(45, 55), data(CoreAttributeTypes.Annotation.getGuid(), CoreAttributeTypes.Category.getGuid())));
+         list(data(45, 55), data(CoreAttributeTypes.Annotation, CoreAttributeTypes.Category)));
    }
 
    @Test
@@ -425,8 +424,7 @@ public class DataLoaderFactoryImplTest {
 
       dataLoader.load(cancellation, builder);
 
-      verifyCommon(EXPECTED_HEAD_TX, expectedLoadLevel, EXCLUDE_DELETED, expected, 45,
-         CoreAttributeTypes.Annotation.getGuid());
+      verifyCommon(EXPECTED_HEAD_TX, expectedLoadLevel, EXCLUDE_DELETED, expected, 45, CoreAttributeTypes.Annotation);
    }
 
    @Test
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallableTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallableTest.java
index a6b5cfd4110..3a527b800ec 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallableTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallableTest.java
@@ -77,8 +77,8 @@ public class IndexingTaskDatabaseTxCallableTest {
       ArrayList<IndexedResource> sources = new ArrayList<>();
       sources.add(resource1);
       sources.add(resource2);
-      when(resource1.getTypeUuid()).thenReturn(Name.getGuid());
-      when(resource2.getTypeUuid()).thenReturn(QualificationMethod.getGuid());
+      when(resource1.getTypeUuid()).thenReturn(Name.getId());
+      when(resource2.getTypeUuid()).thenReturn(QualificationMethod.getId());
       when(resource1.getGammaId()).thenReturn(1L);
       when(resource2.getGammaId()).thenReturn(2L);
       when(engine.hasTagger("")).thenReturn(false);