refactor[TW17325]: Use ArtifactToken and ArtifactTokenType in CM access

Change-Id: Icb64c138648fec9bc2464ad3e6e88cea1406613a

9 files changed, 38 insertions, 72 deletions

diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java
index 87de3244e0e..8088f1c7ea3 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java
@@ -15,7 +15,6 @@ package org.eclipse.osee.framework.core.dsl.integration.internal;
 
 import java.util.Collection;
 import java.util.Iterator;
-import org.eclipse.osee.framework.core.data.ArtifactToken;
 import org.eclipse.osee.framework.core.data.ArtifactTypeToken;
 import org.eclipse.osee.framework.core.data.BranchId;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
@@ -296,11 +295,6 @@ public class ArtifactMatchInterpreterTest {
          }
 
          @Override
-         public ArtifactToken getObject() {
-            return null;
-         }
-
-         @Override
          public Long getId() {
             return 0L;
          }
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactTypeRestrictionHandlerTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactTypeRestrictionHandlerTest.java
index e20acffc754..6fda6bd20c9 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactTypeRestrictionHandlerTest.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactTypeRestrictionHandlerTest.java
@@ -43,7 +43,7 @@ public class ArtifactTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
    @Test
    public void testProcessDataNotMatchesRestriction() {
       ArtifactTypeToken artifactType = Requirement;
-      XArtifactType artifactTypeRef = MockModel.createXArtifactType(artifactType.getId(), artifactType.getName());
+      XArtifactType artifactTypeRef = MockModel.createXArtifactType(artifactType);
 
       ArtifactTypeRestriction restriction = MockModel.createArtifactTypeRestriction();
       restriction.setPermission(AccessPermissionEnum.ALLOW);
@@ -57,7 +57,7 @@ public class ArtifactTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
    @Test
    public void testProcessCreateAccessDetail() {
       ArtifactTypeToken artifactType = Requirement;
-      XArtifactType artifactTypeRef = MockModel.createXArtifactType(artifactType.getId(), artifactType.getName());
+      XArtifactType artifactTypeRef = MockModel.createXArtifactType(artifactType);
 
       ArtifactTypeRestriction restriction = MockModel.createArtifactTypeRestriction();
       restriction.setPermission(AccessPermissionEnum.ALLOW);
@@ -72,7 +72,7 @@ public class ArtifactTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
 
    @Test
    public void testProcessArtifactTypeInheritance() {
-      XArtifactType artifactTypeRef = MockModel.createXArtifactType(Requirement.getId(), Requirement.getName());
+      XArtifactType artifactTypeRef = MockModel.createXArtifactType(Requirement);
 
       ArtifactTypeRestriction restriction = MockModel.createArtifactTypeRestriction();
       restriction.setPermission(AccessPermissionEnum.ALLOW);
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AttributeTypeRestrictionHandlerTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AttributeTypeRestrictionHandlerTest.java
index 8781520f3f5..93250fbc93d 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AttributeTypeRestrictionHandlerTest.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AttributeTypeRestrictionHandlerTest.java
@@ -26,7 +26,6 @@ import org.eclipse.osee.framework.core.dsl.oseeDsl.AccessPermissionEnum;
 import org.eclipse.osee.framework.core.dsl.oseeDsl.AttributeTypeRestriction;
 import org.eclipse.osee.framework.core.dsl.oseeDsl.XArtifactType;
 import org.eclipse.osee.framework.core.dsl.oseeDsl.XAttributeType;
-import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.enums.PermissionEnum;
 import org.eclipse.osee.framework.core.model.access.Scope;
 import org.eclipse.osee.framework.jdk.core.type.MutableBoolean;
@@ -79,8 +78,7 @@ public class AttributeTypeRestrictionHandlerTest extends BaseRestrictionHandlerT
       restriction.setPermission(AccessPermissionEnum.ALLOW);
       restriction.setAttributeTypeRef(attributeTypeRef);
 
-      ArtifactTypeToken artifactType = Requirement;
-      XArtifactType artifactTypeRef = MockModel.createXArtifactType(artifactType.getId(), artifactType.getName());
+      XArtifactType artifactTypeRef = MockModel.createXArtifactType(Requirement);
       restriction.setArtifactTypeRef(artifactTypeRef);
 
       final MutableBoolean wasIsAttributeTypeValidCalled = new MutableBoolean(false);
@@ -96,12 +94,11 @@ public class AttributeTypeRestrictionHandlerTest extends BaseRestrictionHandlerT
       restriction.setPermission(AccessPermissionEnum.ALLOW);
       restriction.setAttributeTypeRef(attributeTypeRef);
 
-      ArtifactTypeToken artifactType = Requirement;
-      XArtifactType artifactTypeRef = MockModel.createXArtifactType(artifactType.getId(), artifactType.getName());
+      XArtifactType artifactTypeRef = MockModel.createXArtifactType(Requirement);
       restriction.setArtifactTypeRef(artifactTypeRef);
 
       final MutableBoolean wasIsAttributeTypeValidCalled = new MutableBoolean(false);
-      ArtifactProxy artifactProxy = createArtifactProxy(artifactType, Name, wasIsAttributeTypeValidCalled, true);
+      ArtifactProxy artifactProxy = createArtifactProxy(Requirement, Name, wasIsAttributeTypeValidCalled, true);
       Scope expectedScope = new Scope();
       DslAsserts.assertAccessDetail(getRestrictionHandler(), restriction, artifactProxy, Name, PermissionEnum.WRITE,
          expectedScope);
@@ -114,8 +111,7 @@ public class AttributeTypeRestrictionHandlerTest extends BaseRestrictionHandlerT
       restriction.setPermission(AccessPermissionEnum.ALLOW);
       restriction.setAttributeTypeRef(attributeTypeRef);
 
-      ArtifactTypeToken artifactType = CoreArtifactTypes.Artifact;
-      XArtifactType artifactTypeRef = MockModel.createXArtifactType(artifactType.getId(), artifactType.getName());
+      XArtifactType artifactTypeRef = MockModel.createXArtifactType(Artifact);
       restriction.setArtifactTypeRef(artifactTypeRef);
 
       ArtifactTypeToken artifactType2 = Requirement;
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java
index b2c3cf32831..e13a2218515 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java
@@ -13,14 +13,13 @@
 
 package org.eclipse.osee.framework.core.dsl.integration.internal;
 
+import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.AbstractSoftwareRequirement;
 import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.SoftwareRequirementMsWord;
 import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import org.eclipse.osee.framework.core.data.ArtifactToken;
 import org.eclipse.osee.framework.core.data.ArtifactTypeToken;
-import org.eclipse.osee.framework.core.data.BranchId;
 import org.eclipse.osee.framework.core.data.RelationTypeSide;
 import org.eclipse.osee.framework.core.data.RelationTypeToken;
 import org.eclipse.osee.framework.core.dsl.integration.mocks.DslAsserts;
@@ -86,10 +85,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       RelationTypeToken testRelationType =
          getTestRelationType(relationType, CoreArtifactTypes.Artifact, SoftwareRequirementMsWord);
 
-      ArtifactTypeToken artTypeToken1 = SoftwareRequirementMsWord;
-
-      MockArtifactProxy artData =
-         new MockArtifactProxy(artTypeToken1, null, null, Collections.singleton(testRelationType));
+      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord, testRelationType);
       RelationTypeSide expectedObject = new RelationTypeSide(testRelationType, RelationSide.SIDE_A);
       Scope expectedScope = new Scope();
       DslAsserts.assertAccessDetail(getRestrictionHandler(), restriction, artData, expectedObject, PermissionEnum.WRITE,
@@ -108,10 +104,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       RelationTypeToken testRelationType =
          getTestRelationType(relationType, CoreArtifactTypes.Artifact, SoftwareRequirementMsWord);
 
-      ArtifactTypeToken artTypeToken1 = SoftwareRequirementMsWord;
-
-      MockArtifactProxy artData =
-         new MockArtifactProxy(artTypeToken1, null, null, Collections.singleton(testRelationType));
+      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord, testRelationType);
       RelationTypeSide expectedObject = new RelationTypeSide(testRelationType, RelationSide.SIDE_A);
       Scope expectedScope = new Scope();
       DslAsserts.assertAccessDetail(getRestrictionHandler(), restriction, artData, expectedObject, PermissionEnum.WRITE,
@@ -130,10 +123,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       RelationTypeToken testRelationType =
          getTestRelationType(relationType, SoftwareRequirementMsWord, CoreArtifactTypes.Artifact);
 
-      ArtifactTypeToken artTypeToken1 = SoftwareRequirementMsWord;
-
-      MockArtifactProxy artData =
-         new MockArtifactProxy(artTypeToken1, null, null, Collections.singleton(testRelationType));
+      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord, testRelationType);
 
       RelationTypeSide expectedObject = new RelationTypeSide(testRelationType, RelationSide.SIDE_B);
       Scope expectedScope = new Scope();
@@ -153,8 +143,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       RelationTypeToken testRelationType =
          getTestRelationType(relationType, SoftwareRequirementMsWord, CoreArtifactTypes.Artifact);
 
-      MockArtifactProxy artData =
-         new MockArtifactProxy(SoftwareRequirementMsWord, null, null, Collections.singleton(testRelationType));
+      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord, testRelationType);
       RelationTypeSide expectedObject = new RelationTypeSide(testRelationType, RelationSide.SIDE_B);
       Scope expectedScope = new Scope();
       DslAsserts.assertAccessDetail(getRestrictionHandler(), restriction, artData, expectedObject, PermissionEnum.WRITE,
@@ -173,10 +162,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       RelationTypeToken testRelationType =
          getTestRelationType(relationType, SoftwareRequirementMsWord, CoreArtifactTypes.Artifact);
 
-      ArtifactTypeToken artTypeToken1 = SoftwareRequirementMsWord;
-
-      MockArtifactProxy artData =
-         new MockArtifactProxy(artTypeToken1, null, null, Collections.singleton(testRelationType));
+      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord, testRelationType);
       RelationTypeSide expectedObject1 = new RelationTypeSide(testRelationType, RelationSide.SIDE_A);
       RelationTypeSide expectedObject2 = new RelationTypeSide(testRelationType, RelationSide.SIDE_B);
 
@@ -212,8 +198,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       RelationTypeToken testRelationType =
          getTestRelationType(relationType, SoftwareRequirementMsWord, CoreArtifactTypes.Artifact);
 
-      MockArtifactProxy artData =
-         new MockArtifactProxy(SoftwareRequirementMsWord, null, null, Collections.singleton(testRelationType));
+      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord, testRelationType);
       RelationTypeSide expectedObject1 = new RelationTypeSide(testRelationType, RelationSide.SIDE_A);
       RelationTypeSide expectedObject2 = new RelationTypeSide(testRelationType, RelationSide.SIDE_B);
 
@@ -241,9 +226,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
 
    @Test
    public void testProcessDataArtifactTypeMatch() {
-
-      ArtifactTypeToken artifactType = CoreArtifactTypes.AbstractSoftwareRequirement;
-      XArtifactType artifactTypeRef = MockModel.createXArtifactType(artifactType.getId(), artifactType.getName());
+      XArtifactType artifactTypeRef = MockModel.createXArtifactType(AbstractSoftwareRequirement);
 
       RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction();
       restriction.setPermission(AccessPermissionEnum.ALLOW);
@@ -258,10 +241,8 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       RelationTypeToken testRelationType =
          getTestRelationType(relationType, SoftwareRequirementMsWord, CoreArtifactTypes.Artifact);
 
-      ArtifactTypeToken artTypeToken1 = SoftwareRequirementMsWord;
-      ArtifactToken expectedAccessObject = ArtifactToken.valueOf(1, "Another Artifact", BranchId.SENTINEL);
-      MockArtifactProxy artData =
-         new MockArtifactProxy(artTypeToken1, expectedAccessObject, null, Collections.singleton(testRelationType));
+      ArtifactToken expectedAccessObject = ArtifactToken.valueOf(1, "Another Artifact", SoftwareRequirementMsWord);
+      MockArtifactProxy artData = new MockArtifactProxy(expectedAccessObject, testRelationType);
 
       RelationTypeSide expectedObject = new RelationTypeSide(testRelationType, RelationSide.SIDE_B);
 
@@ -289,9 +270,8 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       RelationTypeToken testRelationType =
          getTestRelationType(relationType, SoftwareRequirementMsWord, CoreArtifactTypes.Artifact);
 
-      ArtifactToken dummy = ArtifactToken.valueOf(43, artifactName, BranchId.SENTINEL);
-      MockArtifactProxy artData =
-         new MockArtifactProxy(SoftwareRequirementMsWord, dummy, null, Collections.singleton(testRelationType));
+      ArtifactToken dummy = ArtifactToken.valueOf(43, artifactName, SoftwareRequirementMsWord);
+      MockArtifactProxy artData = new MockArtifactProxy(dummy, testRelationType);
       RelationTypeSide expectedObject = new RelationTypeSide(testRelationType, RelationSide.SIDE_B);
       DslAsserts.assertAccessDetail(getRestrictionHandler(), restriction, artData, expectedObject, PermissionEnum.WRITE,
          expectedScope);
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockArtifactProxy.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockArtifactProxy.java
index 8823e89a8d6..53380a57bf4 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockArtifactProxy.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockArtifactProxy.java
@@ -33,7 +33,16 @@ public class MockArtifactProxy implements ArtifactProxy {
    private final ArtifactToken artifactObject;
 
    public MockArtifactProxy(ArtifactToken artifactObject) {
-      this(null, artifactObject, Collections.emptyList(), Collections.emptyList());
+      this(artifactObject.getArtifactType(), artifactObject, Collections.emptyList(), Collections.emptyList());
+   }
+
+   public MockArtifactProxy(ArtifactToken artifactObject, RelationTypeToken validRelationType) {
+      this(artifactObject.getArtifactType(), artifactObject, Collections.emptyList(),
+         Collections.singleton(validRelationType));
+   }
+
+   public MockArtifactProxy(ArtifactTypeToken artifactType, RelationTypeToken validRelationType) {
+      this(artifactType, null, Collections.emptyList(), Collections.singleton(validRelationType));
    }
 
    public MockArtifactProxy() {
@@ -44,7 +53,7 @@ public class MockArtifactProxy implements ArtifactProxy {
       this(artifactType, null, Collections.emptyList(), Collections.emptyList());
    }
 
-   public MockArtifactProxy(ArtifactTypeToken artifactType, ArtifactToken artifactObject, Collection<ArtifactProxy> hierarchy, Collection<RelationTypeToken> validRelationTypes) {
+   private MockArtifactProxy(ArtifactTypeToken artifactType, ArtifactToken artifactObject, Collection<ArtifactProxy> hierarchy, Collection<RelationTypeToken> validRelationTypes) {
       this.artifactType = artifactType;
       this.hierarchy = hierarchy;
       this.validRelationTypes = validRelationTypes;
@@ -72,11 +81,6 @@ public class MockArtifactProxy implements ArtifactProxy {
    }
 
    @Override
-   public ArtifactToken getObject() {
-      return artifactObject;
-   }
-
-   @Override
    public BranchId getBranch() {
       return artifactObject.getBranch();
    }
@@ -95,4 +99,4 @@ public class MockArtifactProxy implements ArtifactProxy {
    public Long getId() {
       return Long.valueOf(artifactObject.getId());
    }
-}
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockModel.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockModel.java
index 90a77c72e26..87abf908d51 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockModel.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockModel.java
@@ -13,6 +13,7 @@
 
 package org.eclipse.osee.framework.core.dsl.integration.mocks;
 
+import org.eclipse.osee.framework.core.data.ArtifactTypeToken;
 import org.eclipse.osee.framework.core.data.AttributeTypeId;
 import org.eclipse.osee.framework.core.data.RelationTypeToken;
 import org.eclipse.osee.framework.core.dsl.OseeDslResourceUtil;
@@ -105,13 +106,13 @@ public final class MockModel {
       return toReturn;
    }
 
-   public static XArtifactType createXArtifactType(long uuid, String name) {
+   public static XArtifactType createXArtifactType(ArtifactTypeToken artifactType) {
       XArtifactType toReturn = OseeDslFactory.eINSTANCE.createXArtifactType();
       Assert.assertNotNull(toReturn);
-      toReturn.setId(String.valueOf(uuid));
-      toReturn.setName(name);
-      Assert.assertEquals(uuid, Long.valueOf(toReturn.getId()).longValue());
-      Assert.assertEquals(name, toReturn.getName());
+      toReturn.setId(artifactType.getIdString());
+      toReturn.setName(artifactType.getName());
+      Assert.assertEquals(artifactType.getId(), Long.valueOf(toReturn.getId()));
+      Assert.assertEquals(artifactType.getName(), toReturn.getName());
       return toReturn;
    }
 
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/ArtifactDataProvider.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/ArtifactDataProvider.java
index 3abd9f9c4cf..10badcb63fc 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/ArtifactDataProvider.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/ArtifactDataProvider.java
@@ -29,8 +29,6 @@ public interface ArtifactDataProvider {
 
       Collection<ArtifactProxy> getHierarchy();
 
-      ArtifactToken getObject();
-
       IOseeBranch getBranchToken();
    }
 
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchRestrictionHandler.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchRestrictionHandler.java
index fd86219912d..88381626aaa 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchRestrictionHandler.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchRestrictionHandler.java
@@ -13,7 +13,6 @@
 
 package org.eclipse.osee.framework.core.dsl.integration.internal;
 
-import org.eclipse.osee.framework.core.data.ArtifactToken;
 import org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider.ArtifactProxy;
 import org.eclipse.osee.framework.core.dsl.integration.RestrictionHandler;
 import org.eclipse.osee.framework.core.dsl.oseeDsl.ArtifactMatchRestriction;
@@ -51,7 +50,7 @@ public class ArtifactMatchRestrictionHandler implements RestrictionHandler<Artif
          XArtifactMatcher artifactMatcher = restriction.getArtifactMatcherRef();
          if (matcherInterpreter.matches(artifactMatcher, artifactProxy)) {
             PermissionEnum permission = OseeUtil.getPermission(restriction);
-            collector.collect(new AccessDetail<>(artifactProxy.getObject(), permission, scope));
+            collector.collect(new AccessDetail<>(artifactProxy, permission, scope));
          }
       }
    }
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataProviderImpl.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataProviderImpl.java
index f0d1593ac9d..6da461831f7 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataProviderImpl.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/ArtifactDataProviderImpl.java
@@ -17,7 +17,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.logging.Level;
-import org.eclipse.osee.framework.core.data.ArtifactToken;
 import org.eclipse.osee.framework.core.data.ArtifactTypeId;
 import org.eclipse.osee.framework.core.data.ArtifactTypeToken;
 import org.eclipse.osee.framework.core.data.AttributeTypeId;
@@ -94,11 +93,6 @@ public final class ArtifactDataProviderImpl implements ArtifactDataProvider {
       }
 
       @Override
-      public ArtifactToken getObject() {
-         return self;
-      }
-
-      @Override
       public Collection<ArtifactProxy> getHierarchy() {
          Collection<ArtifactProxy> hierarchy = new HashSet<>();
          try {