refactor[TW17325]: Remove ArtifactDataProvider.getValidRelationTypes()

Change-Id: I9c2c5c5dc7de5b439c5da1bd59533b24df3694a3

8 files changed, 44 insertions, 76 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 8088f1c7ea3..585c170529e 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
@@ -18,7 +18,6 @@ import java.util.Iterator;
 import org.eclipse.osee.framework.core.data.ArtifactTypeToken;
 import org.eclipse.osee.framework.core.data.BranchId;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.RelationTypeToken;
 import org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider.ArtifactProxy;
 import org.eclipse.osee.framework.core.dsl.integration.mocks.DslAsserts;
 import org.eclipse.osee.framework.core.dsl.integration.mocks.MockModel;
@@ -285,11 +284,6 @@ public class ArtifactMatchInterpreterTest {
          }
 
          @Override
-         public Collection<RelationTypeToken> getValidRelationTypes() {
-            return null;
-         }
-
-         @Override
          public Collection<ArtifactProxy> getHierarchy() {
             return null;
          }
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 7d4293d7e14..cb9f71b6150 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,12 +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.CoreRelationTypes.CodeRequirement;
 import static org.eclipse.osee.framework.core.enums.CoreRelationTypes.DevelopmentalVerification;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.osee.framework.core.access.AccessDetail;
+import org.eclipse.osee.framework.core.OrcsTokenService;
 import org.eclipse.osee.framework.core.access.AccessDetailCollector;
 import org.eclipse.osee.framework.core.access.Scope;
 import org.eclipse.osee.framework.core.data.ArtifactToken;
@@ -36,9 +37,11 @@ import org.eclipse.osee.framework.core.dsl.oseeDsl.XArtifactMatcher;
 import org.eclipse.osee.framework.core.dsl.oseeDsl.XArtifactType;
 import org.eclipse.osee.framework.core.dsl.oseeDsl.XRelationSideEnum;
 import org.eclipse.osee.framework.core.dsl.oseeDsl.XRelationType;
+import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
 import org.eclipse.osee.framework.core.enums.PermissionEnum;
 import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.util.OsgiUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -48,9 +51,11 @@ import org.junit.Test;
  * @author Roberto E. Escobar
  */
 public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTest<RelationTypeRestriction> {
+   private static final OrcsTokenService tokenService =
+      OsgiUtil.getService(OrcsTokenService.class, OrcsTokenService.class);
 
    public RelationTypeRestrictionHandlerTest() {
-      super(new RelationTypeRestrictionHandler(new ArtifactMatchInterpreter()),
+      super(new RelationTypeRestrictionHandler(new ArtifactMatchInterpreter(), tokenService),
          MockModel.createRelationTypeRestriction(), MockModel.createAttributeTypeRestriction());
    }
 
@@ -62,8 +67,8 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       restriction.setPermission(AccessPermissionEnum.ALLOW);
       restriction.setRelationTypeRef(relationTypeRef);
 
-      // Artifact Data has no relation types therefore relation type will not match
-      MockArtifactProxy artData = new MockArtifactProxy();
+      // Artifact Data relation type will not match
+      MockArtifactProxy artData = new MockArtifactProxy(CoreArtifactTypes.BranchView);
       Scope expectedScope = new Scope().add("fail");
       DslAsserts.assertNullAccessDetail(getRestrictionHandler(), restriction, artData, expectedScope);
    }
@@ -78,7 +83,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       restriction.setRelationTypeRef(relationTypeRef);
       restriction.setRestrictedToSide(XRelationSideEnum.SIDE_A);
 
-      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord, testRelationType);
+      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord);
       RelationTypeSide expectedObject = new RelationTypeSide(testRelationType, RelationSide.SIDE_A);
       Scope expectedScope = new Scope();
       DslAsserts.assertAccessDetail(getRestrictionHandler(), restriction, artData, expectedObject, PermissionEnum.WRITE,
@@ -95,7 +100,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       restriction.setRelationTypeRef(relationTypeRef);
       restriction.setRestrictedToSide(XRelationSideEnum.SIDE_A);
 
-      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord, testRelationType);
+      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord);
       RelationTypeSide expectedObject = new RelationTypeSide(testRelationType, RelationSide.SIDE_A);
       Scope expectedScope = new Scope();
       DslAsserts.assertAccessDetail(getRestrictionHandler(), restriction, artData, expectedObject, PermissionEnum.WRITE,
@@ -112,7 +117,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       restriction.setRelationTypeRef(relationTypeRef);
       restriction.setRestrictedToSide(XRelationSideEnum.SIDE_B);
 
-      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord, testRelationType);
+      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord);
 
       RelationTypeSide expectedObject = new RelationTypeSide(testRelationType, RelationSide.SIDE_B);
       Scope expectedScope = new Scope();
@@ -130,7 +135,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       restriction.setRelationTypeRef(relationTypeRef);
       restriction.setRestrictedToSide(XRelationSideEnum.SIDE_B);
 
-      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord, testRelationType);
+      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord);
       RelationTypeSide expectedObject = new RelationTypeSide(testRelationType, RelationSide.SIDE_B);
       Scope expectedScope = new Scope();
       DslAsserts.assertAccessDetail(getRestrictionHandler(), restriction, artData, expectedObject, PermissionEnum.WRITE,
@@ -148,7 +153,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       restriction.setRelationTypeRef(relationTypeRef);
       restriction.setRestrictedToSide(XRelationSideEnum.BOTH);
 
-      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord, testRelationType);
+      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord);
       RelationTypeSide expectedObject1 = new RelationTypeSide(testRelationType, RelationSide.SIDE_A);
       RelationTypeSide expectedObject2 = new RelationTypeSide(testRelationType, RelationSide.SIDE_B);
 
@@ -183,7 +188,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
 
       RelationTypeToken testRelationType = DevelopmentalVerification;
 
-      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord, testRelationType);
+      MockArtifactProxy artData = new MockArtifactProxy(SoftwareRequirementMsWord);
       RelationTypeSide expectedObject1 = new RelationTypeSide(testRelationType, RelationSide.SIDE_A);
       RelationTypeSide expectedObject2 = new RelationTypeSide(testRelationType, RelationSide.SIDE_B);
 
@@ -211,7 +216,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
 
    @Test
    public void testProcessDataArtifactTypeMatch() {
-      XArtifactType artifactTypeRef = MockModel.createXArtifactType(AbstractSoftwareRequirement);
+      XArtifactType artifactTypeRef = MockModel.createXArtifactType(CoreArtifactTypes.FunctionMsWord);
 
       RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction();
       restriction.setPermission(AccessPermissionEnum.ALLOW);
@@ -224,11 +229,11 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       restriction.setRestrictedToSide(XRelationSideEnum.SIDE_B);
 
       RelationTypeToken testRelationType = DevelopmentalVerification;
+      ArtifactToken expectedAccessObject =
+         ArtifactToken.valueOf(1, "Another Artifact", CoreArtifactTypes.SoftwareRequirementMsWord);
+      MockArtifactProxy artData = new MockArtifactProxy(expectedAccessObject);
 
-      ArtifactToken expectedAccessObject = ArtifactToken.valueOf(1, "Another Artifact", SoftwareRequirementMsWord);
-      MockArtifactProxy artData = new MockArtifactProxy(expectedAccessObject, testRelationType);
-
-      RelationTypeSide expectedObject = new RelationTypeSide(testRelationType, RelationSide.SIDE_B);
+      RelationTypeSide expectedObject = new RelationTypeSide(CodeRequirement, RelationSide.SIDE_B);
 
       Scope expectedScope = new Scope();
       expectedScope.addSubPath(artData.getName());
@@ -253,7 +258,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
       restriction.setPredicate(predicate);
 
       ArtifactToken dummy = ArtifactToken.valueOf(43, artifactName, SoftwareRequirementMsWord);
-      MockArtifactProxy artData = new MockArtifactProxy(dummy, testRelationType);
+      MockArtifactProxy artData = new MockArtifactProxy(dummy);
       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 53380a57bf4..ac264d508dd 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
@@ -19,7 +19,6 @@ 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;
-import org.eclipse.osee.framework.core.data.RelationTypeToken;
 import org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider.ArtifactProxy;
 
 /**
@@ -29,34 +28,23 @@ public class MockArtifactProxy implements ArtifactProxy {
 
    private final ArtifactTypeToken artifactType;
    private final Collection<ArtifactProxy> hierarchy;
-   private final Collection<RelationTypeToken> validRelationTypes;
    private final ArtifactToken artifactObject;
 
-   public MockArtifactProxy(ArtifactToken artifactObject) {
-      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() {
       this((ArtifactTypeToken) null);
    }
 
+   public MockArtifactProxy(ArtifactToken artifactObject) {
+      this(artifactObject.getArtifactType(), artifactObject);
+   }
+
    public MockArtifactProxy(ArtifactTypeToken artifactType) {
-      this(artifactType, null, Collections.emptyList(), Collections.emptyList());
+      this(artifactType, null);
    }
 
-   private MockArtifactProxy(ArtifactTypeToken artifactType, ArtifactToken artifactObject, Collection<ArtifactProxy> hierarchy, Collection<RelationTypeToken> validRelationTypes) {
+   private MockArtifactProxy(ArtifactTypeToken artifactType, ArtifactToken artifactObject) {
       this.artifactType = artifactType;
-      this.hierarchy = hierarchy;
-      this.validRelationTypes = validRelationTypes;
+      this.hierarchy = Collections.emptyList();
       this.artifactObject = artifactObject;
    }
 
@@ -71,11 +59,6 @@ public class MockArtifactProxy implements ArtifactProxy {
    }
 
    @Override
-   public Collection<RelationTypeToken> getValidRelationTypes() {
-      return validRelationTypes;
-   }
-
-   @Override
    public Collection<ArtifactProxy> getHierarchy() {
       return hierarchy;
    }
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/OSGI-INF/access.model.interpreter.xml b/plugins/org.eclipse.osee.framework.core.dsl.integration/OSGI-INF/access.model.interpreter.xml
index 1ca5d477561..c16b293009c 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/OSGI-INF/access.model.interpreter.xml
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/OSGI-INF/access.model.interpreter.xml
@@ -6,4 +6,5 @@
    </service>
    <reference bind="setArtifactDataProvider" cardinality="1..1" interface="org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider" name="ArtifactDataProvider" policy="static"/>
    <reference cardinality="1..1" interface="org.eclipse.core.resources.IWorkspace" name="IWorkspace" policy="static"/>
+   <reference bind="setOrcsTokenService" cardinality="1..1" interface="org.eclipse.osee.framework.core.OrcsTokenService" name="OrcsTokenService" policy="static"/>
 </scr:component>
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 10badcb63fc..b5c22835093 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
@@ -16,7 +16,6 @@ package org.eclipse.osee.framework.core.dsl.integration;
 import java.util.Collection;
 import org.eclipse.osee.framework.core.data.ArtifactToken;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.RelationTypeToken;
 
 /**
  * @author Roberto E. Escobar
@@ -25,8 +24,6 @@ public interface ArtifactDataProvider {
 
    public static interface ArtifactProxy extends ArtifactToken {
 
-      Collection<RelationTypeToken> getValidRelationTypes();
-
       Collection<ArtifactProxy> getHierarchy();
 
       IOseeBranch getBranchToken();
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterProxy.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterProxy.java
index 89c3142e608..cdff2b915f9 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterProxy.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterProxy.java
@@ -15,6 +15,7 @@ package org.eclipse.osee.framework.core.dsl.integration.internal;
 
 import java.util.Collection;
 import org.eclipse.osee.framework.core.access.AccessDetailCollector;
+import org.eclipse.osee.framework.core.OrcsTokenService;
 import org.eclipse.osee.framework.core.data.IAccessContextId;
 import org.eclipse.osee.framework.core.dsl.integration.AccessModelInterpreter;
 import org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider;
@@ -29,11 +30,16 @@ public class AccessModelInterpreterProxy implements AccessModelInterpreter {
 
    private ArtifactDataProvider artifactDataProvider;
    private AccessModelInterpreter proxiedService;
+   private OrcsTokenService tokenService;
 
    public void setArtifactDataProvider(ArtifactDataProvider artifactDataProvider) {
       this.artifactDataProvider = artifactDataProvider;
    }
 
+   public void setOrcsTokenService(OrcsTokenService tokenService) {
+      this.tokenService = tokenService;
+   }
+
    public void start() {
       // Do Nothing
    }
@@ -54,7 +60,7 @@ public class AccessModelInterpreterProxy implements AccessModelInterpreter {
             new ArtifactMatchRestrictionHandler(matcher),
             new ArtifactTypeRestrictionHandler(),
             new AttributeTypeRestrictionHandler(),
-            new RelationTypeRestrictionHandler(matcher)};
+            new RelationTypeRestrictionHandler(matcher, tokenService)};
 
          proxiedService = new AccessModelInterpreterImpl(artifactDataProvider, matcher, restrictionHandlers);
       }
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandler.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandler.java
index f24df33c378..2c1bd950fbe 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandler.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandler.java
@@ -16,6 +16,7 @@ package org.eclipse.osee.framework.core.dsl.integration.internal;
 import java.util.Collection;
 import java.util.Collections;
 import org.eclipse.osee.framework.core.access.AccessDetail;
+import org.eclipse.osee.framework.core.OrcsTokenService;
 import org.eclipse.osee.framework.core.access.AccessDetailCollector;
 import org.eclipse.osee.framework.core.access.Scope;
 import org.eclipse.osee.framework.core.data.ArtifactTypeToken;
@@ -41,9 +42,11 @@ import org.eclipse.osee.framework.core.enums.RelationSide;
 public class RelationTypeRestrictionHandler implements RestrictionHandler<RelationTypeRestriction> {
 
    private final ArtifactMatchInterpreter matcherInterpreter;
+   private final OrcsTokenService tokenService;
 
-   public RelationTypeRestrictionHandler(ArtifactMatchInterpreter matcherInterpreter) {
+   public RelationTypeRestrictionHandler(ArtifactMatchInterpreter matcherInterpreter, OrcsTokenService tokenService) {
       this.matcherInterpreter = matcherInterpreter;
+      this.tokenService = tokenService;
    }
 
    @Override
@@ -102,29 +105,14 @@ public class RelationTypeRestrictionHandler implements RestrictionHandler<Relati
    private Collection<RelationTypeToken> getRelationTypes(ArtifactProxy artifactProxy, RelationTypeRestriction restriction) {
       Collection<RelationTypeToken> types;
       if (restriction.isRelationTypeMatch()) {
-         types = artifactProxy.getValidRelationTypes();
+         types = tokenService.getValidRelationTypes(artifactProxy.getArtifactType());
       } else {
          XRelationType xRelationType = restriction.getRelationTypeRef();
          Long typeToMatch = OseeUtil.checkAndGetUuid(xRelationType);
-         RelationTypeToken relationType = getRelationType(typeToMatch, artifactProxy);
-         if (relationType != null) {
-            types = Collections.singleton(relationType);
-         } else {
-            types = Collections.emptyList();
-         }
+         Collection<RelationTypeToken> relationTypes =
+            tokenService.getValidRelationTypes(artifactProxy.getArtifactType());
+         types = relationTypes.contains(typeToMatch) ? Collections.singleton(typeToMatch) : Collections.emptyList();
       }
       return types;
    }
-
-   private RelationTypeToken getRelationType(Long typeToMatch, ArtifactProxy artifactProxy) {
-      RelationTypeToken toReturn = null;
-      Collection<RelationTypeToken> relationTypes = artifactProxy.getValidRelationTypes();
-      for (RelationTypeToken relationType : relationTypes) {
-         if (relationType.equals(typeToMatch)) {
-            toReturn = relationType;
-            break;
-         }
-      }
-      return toReturn;
-   }
 }
\ No newline at end of file
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 6133b4758f7..0d244c6e438 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
@@ -23,7 +23,6 @@ import org.eclipse.osee.framework.core.data.ArtifactTypeToken;
 import org.eclipse.osee.framework.core.data.AttributeTypeId;
 import org.eclipse.osee.framework.core.data.BranchId;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.RelationTypeToken;
 import org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider;
 import org.eclipse.osee.framework.jdk.core.type.Id;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -94,11 +93,6 @@ public final class ArtifactDataProviderImpl implements ArtifactDataProvider {
       }
 
       @Override
-      public Collection<RelationTypeToken> getValidRelationTypes() {
-         return tokenService.getValidRelationTypes(self.getArtifactType());
-      }
-
-      @Override
       public Collection<ArtifactProxy> getHierarchy() {
          Collection<ArtifactProxy> hierarchy = new HashSet<>();
          try {