diff options
| author | Ryan D. Brooks | 2016-09-22 22:42:28 +0000 |
|---|---|---|
| committer | Ryan T. Baldwin | 2016-09-22 22:42:28 +0000 |
| commit | 28d110a7b15f041c6b8cc2149eb48a3f27747da4 (patch) | |
| tree | 6ca28aa082c0cfb2ff478711315779f752ab4bf8 /plugins | |
| parent | 3f6761efc434cc16e5d09cf52217c26e058262e6 (diff) | |
| download | org.eclipse.osee-28d110a7b15f041c6b8cc2149eb48a3f27747da4.tar.gz org.eclipse.osee-28d110a7b15f041c6b8cc2149eb48a3f27747da4.tar.xz org.eclipse.osee-28d110a7b15f041c6b8cc2149eb48a3f27747da4.zip | |
refactor: Create RelationTypeToken
Change-Id: I4ab51ba2005537130dec01053cd6279885a749da
Diffstat (limited to 'plugins')
45 files changed, 204 insertions, 168 deletions
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/CreateTasksOperation.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/CreateTasksOperation.java index 5f7f45418cb..9ac99293331 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/CreateTasksOperation.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/CreateTasksOperation.java @@ -39,7 +39,7 @@ import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.RelationTypeSide; -import org.eclipse.osee.framework.core.data.RelationTypeSide; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; @@ -194,13 +194,13 @@ public class CreateTasksOperation { return resultData; } - private IRelationType getRelationType(IAtsServer atsServer, String relationTypeName) { - for (IRelationType relation : atsServer.getOrcsApi().getOrcsTypes().getRelationTypes().getAll()) { + private RelationTypeToken getRelationType(IAtsServer atsServer, String relationTypeName) { + for (RelationTypeToken relation : atsServer.getOrcsApi().getOrcsTypes().getRelationTypes().getAll()) { if (relation.getName().equals(relationTypeName)) { return relation; } } - return null; + return RelationTypeToken.SENTINEL; } private static IAttributeType getAttributeType(IAtsServer atsServer, String attrTypeName) { @@ -302,7 +302,7 @@ public class CreateTasksOperation { } for (JaxRelation relation : jaxTask.getRelations()) { - IRelationType relationType = getRelationType(atsServer, relation.getRelationTypeName()); + RelationTypeToken relationType = getRelationType(atsServer, relation.getRelationTypeName()); if (relationType == null) { resultData.errorf("Relation Type [%s] not valid for Task creation in %s", relation.getRelationTypeName(), task); diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactPasteOperationTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactPasteOperationTest.java index 91131c5975e..6fd18b240cc 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactPasteOperationTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactPasteOperationTest.java @@ -20,6 +20,7 @@ import java.util.Map.Entry; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.enums.RelationSide; @@ -179,7 +180,7 @@ public class ArtifactPasteOperationTest { List<Artifact> childArtifacts = artifactToCheck.getChildren(); Assert.assertEquals(hasChildren, !childArtifacts.isEmpty()); - for (Entry<Pair<IRelationType, RelationSide>, Pair<RelationSorter, List<String>>> entry : data.entrySet()) { + for (Entry<Pair<RelationTypeToken, RelationSide>, Pair<RelationSorter, List<String>>> entry : data.entrySet()) { IRelationType relationTypeId = entry.getKey().getFirst(); RelationSide relationSide = entry.getKey().getSecond(); RelationSorter orderGuid = entry.getValue().getFirst(); 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 ea0952a8a0d..f9fa8fec132 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 @@ -19,8 +19,8 @@ import java.util.Set; import org.eclipse.osee.framework.core.data.ArtifactToken; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.IRelationType; 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; import org.eclipse.osee.framework.core.dsl.integration.mocks.MockArtifactProxy; import org.eclipse.osee.framework.core.dsl.integration.mocks.MockModel; @@ -54,6 +54,7 @@ import org.junit.Test; * @author Roberto E. Escobar */ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTest<RelationTypeRestriction> { + private static final RelationTypeToken relationType = CoreRelationTypes.Default_Hierarchical__Child; public RelationTypeRestrictionHandlerTest() { super(new RelationTypeRestrictionHandler(new ArtifactMatchInterpreter()), @@ -62,7 +63,6 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe @Test public void testProcessDataRelationTypeNoMatch() throws OseeCoreException { - IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child; XRelationType relationTypeRef = MockModel.createXRelationType(relationType); RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction(); @@ -77,7 +77,6 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe @Test public void testProcessDataRelationTypeMatchSideANoMatch() throws OseeCoreException { - IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child; XRelationType relationTypeRef = MockModel.createXRelationType(relationType); RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction(); @@ -101,7 +100,6 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe @Test public void testProcessDataRelationTypeMatchSideAMatch() throws OseeCoreException { - IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child; XRelationType relationTypeRef = MockModel.createXRelationType(relationType); RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction(); @@ -129,7 +127,6 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe @Test public void testProcessDataRelationTypeMatchSideBNoMatch() throws OseeCoreException { - IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child; XRelationType relationTypeRef = MockModel.createXRelationType(relationType); RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction(); @@ -154,7 +151,6 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe @Test public void testProcessDataRelationTypeMatchSideBMatch() throws OseeCoreException { - IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child; XRelationType relationTypeRef = MockModel.createXRelationType(relationType); RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction(); @@ -182,7 +178,6 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe @Test public void testProcessDataRelationTypeMatchBothMatch() throws OseeCoreException { - IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child; XRelationType relationTypeRef = MockModel.createXRelationType(relationType); RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction(); @@ -234,8 +229,6 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe restriction.setRelationTypeMatch(true); restriction.setRestrictedToSide(XRelationSideEnum.BOTH); - IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child; - RelationType testRelationType = getTestRelationType(relationType, CoreArtifactTypes.SoftwareRequirement, CoreArtifactTypes.Artifact); @@ -275,7 +268,6 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe @Test public void testProcessDataArtifactTypeMatch() throws OseeCoreException { - IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child; IArtifactType artifactType = CoreArtifactTypes.AbstractSoftwareRequirement; XArtifactType artifactTypeRef = MockModel.createXArtifactType(artifactType.getGuid(), artifactType.getName()); @@ -313,7 +305,6 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe } private void testProcessRelationWithArtifactHelper(String artifactName, String matcherArtifactName, Scope expectedScope) throws OseeCoreException { - IRelationType relationType = CoreRelationTypes.Default_Hierarchical__Child; XRelationType relationTypeRef = MockModel.createXRelationType(relationType); RelationTypeRestriction restriction = MockModel.createRelationTypeRestriction(); @@ -357,7 +348,7 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe testProcessRelationWithArtifactHelper("artifactToMatch", "differentArtifactToMatch", new Scope()); } - private static RelationType getTestRelationType(IRelationType relationType, IArtifactType aArtTypeToken, IArtifactType bArtTypeToken) { + private static RelationType getTestRelationType(RelationTypeToken relationType, IArtifactType aArtTypeToken, IArtifactType bArtTypeToken) { return new RelationType(relationType.getId(), relationType.getName(), "sideA_" + aArtTypeToken.getName(), "sideB_" + bArtTypeToken.getName(), aArtTypeToken, bArtTypeToken, RelationTypeMultiplicity.MANY_TO_MANY, LEXICOGRAPHICAL_ASC); 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 63fcf72fb88..b503eee0bf2 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.dsl.integration.mocks; -import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.dsl.OseeDslResourceUtil; import org.eclipse.osee.framework.core.dsl.oseeDsl.AccessContext; import org.eclipse.osee.framework.core.dsl.oseeDsl.ArtifactMatchRestriction; @@ -122,7 +122,7 @@ public final class MockModel { return toReturn; } - public static XRelationType createXRelationType(IRelationType type) throws OseeCoreException { + public static XRelationType createXRelationType(RelationTypeToken type) throws OseeCoreException { String name = type.getName(); long id = type.getId(); XRelationType toReturn = OseeDslFactory.eINSTANCE.createXRelationType(); diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationType.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationType.java index 3d25a900e8a..8f90b65cb0c 100644 --- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationType.java +++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationType.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.model.type; import static org.eclipse.osee.framework.core.enums.RelationSorter.UNORDERED; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity; @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; /** * @author Robert A. Fisher */ -public final class RelationType extends AbstractOseeIdType implements IRelationType { +public final class RelationType extends AbstractOseeIdType implements RelationTypeToken { private static final String RELATION_SIDE_A_NAME_FIELD_KEY = "osee.relation.type.side.a.name.field"; private static final String RELATION_SIDE_B_NAME_FIELD_KEY = "osee.relation.type.side.b.name.field"; diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationType.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationType.java index 8b83bb8de4f..361f9f2ed7c 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationType.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationType.java @@ -13,22 +13,22 @@ package org.eclipse.osee.framework.core.data; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.eclipse.osee.framework.jdk.core.type.Id; import org.eclipse.osee.framework.jdk.core.type.IdSerializer; -import org.eclipse.osee.framework.jdk.core.type.Named; import org.eclipse.osee.framework.jdk.core.type.NamedId; /** * @author Ryan D. Brooks */ @JsonSerialize(using = IdSerializer.class) -public interface IRelationType extends Named, Id { +// TODO: Rename to RelationTypeId +public interface IRelationType extends Id { public static IRelationType valueOf(long id, String name) { - final class RelationTypeImpl extends NamedId implements IRelationType { + final class RelationTypeIdImpl extends NamedId implements IRelationType { - public RelationTypeImpl(Long txId, String name) { - super(txId, name); + public RelationTypeIdImpl(Long id, String name) { + super(id, name); } } - return new RelationTypeImpl(id, name); + return new RelationTypeIdImpl(id, name); } } diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeSide.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeSide.java index e7a45370ac8..0e73e02caad 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeSide.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeSide.java @@ -17,23 +17,23 @@ import org.eclipse.osee.framework.jdk.core.type.NamedId; /** * @author Andrew M. Finkbeiner */ -public class RelationTypeSide extends NamedId implements IRelationType { +public class RelationTypeSide extends NamedId implements RelationTypeToken { - private final IRelationType type; + private final RelationTypeToken type; private final RelationSide side; private RelationTypeSide opposite; - public RelationTypeSide(IRelationType type, RelationSide side) { + public RelationTypeSide(RelationTypeToken type, RelationSide side) { super(type.getId(), type.getName()); this.type = type; this.side = side; } public static RelationTypeSide create(RelationSide side, long id, String name) { - return new RelationTypeSide(IRelationType.valueOf(id, name), side); + return new RelationTypeSide(RelationTypeToken.create(id, name), side); } - public static RelationTypeSide create(IRelationType type, RelationSide side) { + public static RelationTypeSide create(RelationTypeToken type, RelationSide side) { return new RelationTypeSide(type, side); } @@ -44,7 +44,7 @@ public class RelationTypeSide extends NamedId implements IRelationType { return opposite; } - public IRelationType getRelationType() { + public RelationTypeToken getRelationType() { return type; } diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeToken.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeToken.java new file mode 100644 index 00000000000..697aee53235 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeToken.java @@ -0,0 +1,36 @@ +/******************************************************************************* + * Copyright (c) 2016 Boeing. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.framework.core.data; + +import org.eclipse.osee.framework.jdk.core.type.Id; +import org.eclipse.osee.framework.jdk.core.type.Named; +import org.eclipse.osee.framework.jdk.core.type.NamedId; + +/** + * @author Ryan D. Brooks + */ +public interface RelationTypeToken extends IRelationType, Named { + RelationTypeToken SENTINEL = create(Id.SENTINEL, Named.SENTINEL); + + public static RelationTypeToken create(long id, String name) { + return create(Long.valueOf(id), name); + } + + public static RelationTypeToken create(Long id, String name) { + final class RelationTypeTokenImpl extends NamedId implements RelationTypeToken { + + public RelationTypeTokenImpl(Long id, String name) { + super(id, name); + } + } + return new RelationTypeTokenImpl(id, name); + } +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java index ba7eb51127e..53e71ca9fb3 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java @@ -52,8 +52,8 @@ public final class TokenFactory { return new AttributeTypeToken(guid, name, description); } - public static IRelationType createRelationType(long id, String name) { - return IRelationType.valueOf(id, name); + public static RelationTypeToken createRelationType(long id, String name) { + return RelationTypeToken.create(id, name); } public static IAccessContextId createAccessContextId(String guid, String name) { diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreRelationTypes.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreRelationTypes.java index 880362d43b5..e67227a8b15 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreRelationTypes.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreRelationTypes.java @@ -11,8 +11,8 @@ package org.eclipse.osee.framework.core.enums; import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_A; -import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.RelationTypeSide; +import org.eclipse.osee.framework.core.data.RelationTypeToken; public final class CoreRelationTypes { @@ -25,7 +25,7 @@ public final class CoreRelationTypes { public static final RelationTypeSide Default_Hierarchical__Parent = RelationTypeSide.create(SIDE_A, 0x2000000000000154L, "Default Hierarchical"); public static final RelationTypeSide Default_Hierarchical__Child = Default_Hierarchical__Parent.getOpposite(); - public static final IRelationType DEFAULT_HIERARCHY = Default_Hierarchical__Parent; + public static final RelationTypeToken DEFAULT_HIERARCHY = Default_Hierarchical__Parent; public static final RelationSide IS_PARENT = RelationSide.SIDE_A; public static final RelationSide IS_CHILD = RelationSide.SIDE_B; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java index 45174a9551a..ef17d0504fc 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java @@ -28,6 +28,7 @@ import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.RelationTypeSide; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -243,7 +244,7 @@ public class RelationTypeSideSorterTest { private static void checkData(RelationOrderData orderData, List<Object[]> expectedValues) { int index = 0; Assert.assertEquals(expectedValues.size(), orderData.size()); - for (Entry<Pair<IRelationType, RelationSide>, Pair<RelationSorter, List<String>>> entry : orderData.getOrderedEntrySet()) { + for (Entry<Pair<RelationTypeToken, RelationSide>, Pair<RelationSorter, List<String>>> entry : orderData.getOrderedEntrySet()) { Object[] actual = new Object[] { entry.getKey().getFirst(), entry.getKey().getSecond(), diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java index e2c772f2fb9..1920506dbd2 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map.Entry; import java.util.Random; -import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.enums.RelationSide; @@ -215,7 +215,7 @@ public class RelationOrderDataTest { private void checkData(RelationOrderData orderData, List<Object[]> expectedValues) { int index = 0; Assert.assertEquals(expectedValues.size(), orderData.size()); - for (Entry<Pair<IRelationType, RelationSide>, Pair<RelationSorter, List<String>>> entry : orderData.getOrderedEntrySet()) { + for (Entry<Pair<RelationTypeToken, RelationSide>, Pair<RelationSorter, List<String>>> entry : orderData.getOrderedEntrySet()) { Object[] actual = new Object[] { entry.getKey().getFirst(), entry.getKey().getSecond(), diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java index 46bb72bd450..dec1ce8213e 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java @@ -23,6 +23,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map.Entry; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; import org.eclipse.osee.framework.core.model.type.RelationType; @@ -207,7 +208,7 @@ public class RelationOrderParserTest { private void checkData(RelationOrderData orderData, List<Object[]> expectedValues) { int index = 0; Assert.assertEquals(expectedValues.size(), orderData.size()); - for (Entry<Pair<IRelationType, RelationSide>, Pair<RelationSorter, List<String>>> entry : orderData.getOrderedEntrySet()) { + for (Entry<Pair<RelationTypeToken, RelationSide>, Pair<RelationSorter, List<String>>> entry : orderData.getOrderedEntrySet()) { Object[] actual = new Object[] { entry.getKey().getFirst(), entry.getKey().getSecond(), diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java index 094a84e03c5..481c5cbe6ae 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java @@ -547,8 +547,8 @@ public class RelationManager { return relation; } } - throw new OseeCoreException("Unable to find a relation link for type[%s] artA[%s] artB[%s]", - relationType.getName(), artifactA.getName(), artifactB.getName()); + throw new OseeCoreException("Unable to find a relation link for type[%s] artA[%s] artB[%s]", relationType, + artifactA.getName(), artifactB.getName()); } public static List<RelationSorter> getRelationOrderTypes() { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java index 5a658955c84..9c1e197d7ac 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java @@ -19,7 +19,7 @@ import java.util.Comparator; import java.util.List; import java.util.Map.Entry; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidArtifact; @@ -38,7 +38,7 @@ import org.eclipse.osee.framework.skynet.core.utility.Artifacts; */ public class RelationOrderData { - private final CompositeKeyHashMap<IRelationType, RelationSide, Pair<RelationSorter, List<String>>> lists; + private final CompositeKeyHashMap<RelationTypeToken, RelationSide, Pair<RelationSorter, List<String>>> lists; private final IRelationOrderAccessor accessor; private final IArtifact artifact; @@ -61,18 +61,18 @@ public class RelationOrderData { accessor.load(getIArtifact(), this); } - public Collection<Entry<Pair<IRelationType, RelationSide>, Pair<RelationSorter, List<String>>>> entrySet() { + public Collection<Entry<Pair<RelationTypeToken, RelationSide>, Pair<RelationSorter, List<String>>>> entrySet() { return lists.entrySet(); } - public Collection<Entry<Pair<IRelationType, RelationSide>, Pair<RelationSorter, List<String>>>> getOrderedEntrySet() { - List<Entry<Pair<IRelationType, RelationSide>, Pair<RelationSorter, List<String>>>> entries = + public Collection<Entry<Pair<RelationTypeToken, RelationSide>, Pair<RelationSorter, List<String>>>> getOrderedEntrySet() { + List<Entry<Pair<RelationTypeToken, RelationSide>, Pair<RelationSorter, List<String>>>> entries = new ArrayList<>(entrySet()); Collections.sort(entries, new EntryComparator()); return entries; } - public List<String> getOrderList(IRelationType type, RelationSide side) throws OseeCoreException { + public List<String> getOrderList(RelationTypeToken type, RelationSide side) throws OseeCoreException { Pair<RelationSorter, List<String>> currentOrder = getTypeSideEntry(type, side); return currentOrder != null ? currentOrder.getSecond() : new ArrayList<String>(); } @@ -82,15 +82,15 @@ public class RelationOrderData { return currentOrder != null ? currentOrder.getFirst() : type.getDefaultOrderTypeGuid(); } - private Pair<RelationSorter, List<String>> getTypeSideEntry(IRelationType type, RelationSide side) throws OseeCoreException { + private Pair<RelationSorter, List<String>> getTypeSideEntry(RelationTypeToken type, RelationSide side) throws OseeCoreException { return lists.get(type, side); } - public void addOrderList(IRelationType relationType, RelationSide relationSide, RelationSorter sorterId, List<String> guidList) { + public void addOrderList(RelationTypeToken relationType, RelationSide relationSide, RelationSorter sorterId, List<String> guidList) { lists.put(relationType, relationSide, new Pair<RelationSorter, List<String>>(sorterId, guidList)); } - public void removeOrderList(IRelationType type, RelationSide side) throws OseeCoreException { + public void removeOrderList(RelationTypeToken type, RelationSide side) throws OseeCoreException { Conditions.checkNotNull(type, "relationType"); Conditions.checkNotNull(side, "relationSide"); lists.removeAndGet(type, side); @@ -135,7 +135,7 @@ public class RelationOrderData { return sorterId.equals(type.getDefaultOrderTypeGuid()) && isDifferentSorterId(type, side, sorterId); } - protected boolean isRelativeOrderChange(IRelationType type, RelationSide side, RelationSorter sorterId, List<String> relativeSequence) throws OseeCoreException { + protected boolean isRelativeOrderChange(RelationTypeToken type, RelationSide side, RelationSorter sorterId, List<String> relativeSequence) throws OseeCoreException { return sorterId.equals(USER_DEFINED) && !relativeSequence.equals(getOrderList(type, side)); } @@ -149,15 +149,15 @@ public class RelationOrderData { return String.format("Relation Order Data for artifact:%s", getIArtifact()); } - public List<Pair<IRelationType, RelationSide>> getAvailableTypeSides() { + public List<Pair<RelationTypeToken, RelationSide>> getAvailableTypeSides() { return lists.getEnumeratedKeys(); } - private final static class EntryComparator implements Serializable, Comparator<Entry<Pair<IRelationType, RelationSide>, Pair<RelationSorter, List<String>>>> { + private final static class EntryComparator implements Serializable, Comparator<Entry<Pair<RelationTypeToken, RelationSide>, Pair<RelationSorter, List<String>>>> { private static final long serialVersionUID = 5242452476694174988L; @Override - public int compare(Entry<Pair<IRelationType, RelationSide>, Pair<RelationSorter, List<String>>> o1, Entry<Pair<IRelationType, RelationSide>, Pair<RelationSorter, List<String>>> o2) { + public int compare(Entry<Pair<RelationTypeToken, RelationSide>, Pair<RelationSorter, List<String>>> o1, Entry<Pair<RelationTypeToken, RelationSide>, Pair<RelationSorter, List<String>>> o2) { int result = o1.getKey().getFirst().compareTo(o2.getKey().getFirst()); if (result == 0) { result = o1.getKey().getSecond().compareTo(o2.getKey().getSecond()); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java index b888ce8b9d0..8608d2abe97 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java @@ -15,8 +15,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.List; -import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.RelationTypeSide; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; @@ -36,7 +36,7 @@ public class RelationOrderMergeUtility { RelationOrderData mergedData = new RelationOrderData(new ArtifactRelationOrderAccessor(new RelationOrderParser()), right); - for (Pair<IRelationType, RelationSide> typeSide : getAllTypeSides(leftData, rightData)) { + for (Pair<RelationTypeToken, RelationSide> typeSide : getAllTypeSides(leftData, rightData)) { RelationType type = RelationTypeManager.getType(typeSide.getFirst()); RelationSide side = typeSide.getSecond(); RelationTypeSide rts = new RelationTypeSide(type, side); @@ -56,11 +56,10 @@ public class RelationOrderMergeUtility { return mergedData; } - private static Collection<Pair<IRelationType, RelationSide>> getAllTypeSides(RelationOrderData leftData, RelationOrderData rightData) { - Collection<Pair<IRelationType, RelationSide>> rts = new HashSet<>(); + private static Collection<Pair<RelationTypeToken, RelationSide>> getAllTypeSides(RelationOrderData leftData, RelationOrderData rightData) { + Collection<Pair<RelationTypeToken, RelationSide>> rts = new HashSet<>(); rts.addAll(leftData.getAvailableTypeSides()); rts.addAll(rightData.getAvailableTypeSides()); - return rts; } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParser.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParser.java index e0f02550784..eec4ed34ba2 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParser.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParser.java @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map.Entry; -import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; @@ -75,7 +75,7 @@ public class RelationOrderParser { StringBuilder sb = new StringBuilder(); openRoot(sb); - for (Entry<Pair<IRelationType, RelationSide>, Pair<RelationSorter, List<String>>> entry : data.getOrderedEntrySet()) { + for (Entry<Pair<RelationTypeToken, RelationSide>, Pair<RelationSorter, List<String>>> entry : data.getOrderedEntrySet()) { writeEntry(sb, entry); sb.append("\n"); } @@ -95,8 +95,8 @@ public class RelationOrderParser { sb.append(">"); } - private void writeEntry(StringBuilder sb, Entry<Pair<IRelationType, RelationSide>, Pair<RelationSorter, List<String>>> entry) { - Pair<IRelationType, RelationSide> key = entry.getKey(); + private void writeEntry(StringBuilder sb, Entry<Pair<RelationTypeToken, RelationSide>, Pair<RelationSorter, List<String>>> entry) { + Pair<RelationTypeToken, RelationSide> key = entry.getKey(); sb.append("<"); sb.append("Order "); sb.append("relType=\""); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RelationOrderRendererTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RelationOrderRendererTest.java index 840a611c836..39a5cdb9edf 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RelationOrderRendererTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RelationOrderRendererTest.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.List; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity; @@ -87,7 +87,7 @@ public class RelationOrderRendererTest { checkRelationOrderRenderer(getExpected(expectedData), orderData); } - private void addData(RelationOrderData orderData, List<Object[]> expectedData, IRelationType relationType, String relationSideName, RelationSide side, RelationSorter expectedSorterId, String... guids) throws OseeCoreException { + private void addData(RelationOrderData orderData, List<Object[]> expectedData, RelationTypeToken relationType, String relationSideName, RelationSide side, RelationSorter expectedSorterId, String... guids) throws OseeCoreException { List<String> guidList = Arrays.asList(guids); orderData.addOrderList(relationType, side, expectedSorterId, guidList); expectedData.add(new Object[] { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/WrapperForRelationLink.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/WrapperForRelationLink.java index a0aa26e5e3e..63d60fad55f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/WrapperForRelationLink.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/WrapperForRelationLink.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.ui.skynet; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -20,19 +20,19 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; */ class WrapperForRelationLink implements IAdaptable { - private final IRelationType relationType; + private final RelationTypeToken relationType; private final Artifact artifactA; private final Artifact artifactB; private final Artifact other; - public WrapperForRelationLink(IRelationType relationType, Artifact other, Artifact artifactA, Artifact artifactB) { + public WrapperForRelationLink(RelationTypeToken relationType, Artifact other, Artifact artifactA, Artifact artifactB) { this.relationType = relationType; this.artifactA = artifactA; this.artifactB = artifactB; this.other = other; } - IRelationType getRelationType() { + RelationTypeToken getRelationType() { return relationType; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java index 91c027a0b52..178ea41055a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java @@ -17,7 +17,7 @@ import java.util.Collections; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist; @@ -89,7 +89,7 @@ public class RelationOrderRepairBlam extends AbstractBlam { private void resetRelationOrder(Artifact art) throws OseeCoreException, IOException { RelationOrderData currentData = new RelationOrderFactory().createRelationOrderData(art); - for (Pair<IRelationType, RelationSide> typeSide : currentData.getAvailableTypeSides()) { + for (Pair<RelationTypeToken, RelationSide> typeSide : currentData.getAvailableTypeSides()) { RelationType type; try { type = RelationTypeManager.getType(typeSide.getFirst()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java index 2f667896481..a8a21ce6f9c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java @@ -15,6 +15,7 @@ import java.util.Map.Entry; import java.util.logging.Level; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; import org.eclipse.osee.framework.core.model.cache.AbstractOseeCache; @@ -68,7 +69,7 @@ public class RelationOrderRenderer { writer.addTableRow(NO_DATA_TAG); } else { writer.addTableRow("Relation Type", "Side Name", "Side", "Order Type", "Related Artifacts"); - for (Entry<Pair<IRelationType, RelationSide>, Pair<RelationSorter, List<String>>> entry : relationOrderData.getOrderedEntrySet()) { + for (Entry<Pair<RelationTypeToken, RelationSide>, Pair<RelationSorter, List<String>>> entry : relationOrderData.getOrderedEntrySet()) { IRelationType relationTypeId = entry.getKey().getFirst(); RelationSide relationSide = entry.getKey().getSecond(); RelationSorter sorterGuid = entry.getValue().getFirst(); diff --git a/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF index bdc7d5dabab..d6890c897bf 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF @@ -12,6 +12,7 @@ Import-Package: com.google.common.util.concurrent;version="15.0.0", org.eclipse.osee.framework.core.model.cache, org.eclipse.osee.framework.core.model.mocks, org.eclipse.osee.framework.core.model.type, + org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.resource.management.util, org.hamcrest.core, org.junit, diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/graph/impl/GraphBuilderImplTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/graph/impl/GraphBuilderImplTest.java index b4a6e7aa353..89e071d35b8 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/graph/impl/GraphBuilderImplTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/graph/impl/GraphBuilderImplTest.java @@ -16,7 +16,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TransactionId; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; @@ -49,7 +49,7 @@ import org.mockito.Mock; */ public class GraphBuilderImplTest { - private static final IRelationType TYPE_1 = TokenFactory.createRelationType(123456789L, "TYPE_1"); + private static final RelationTypeToken TYPE_1 = TokenFactory.createRelationType(123456789L, "TYPE_1"); private static final TransactionId TRANSACTION_ID = TransactionId.valueOf(231214214); @Rule diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerTest.java index 15a109adf6e..5ae8511ff65 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerTest.java @@ -37,6 +37,7 @@ import org.eclipse.osee.framework.core.enums.LoadLevel; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity; +import org.eclipse.osee.framework.jdk.core.type.Id; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.framework.jdk.core.type.ResultSets; @@ -46,7 +47,6 @@ import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.ds.RelationData; import org.eclipse.osee.orcs.core.internal.graph.GraphData; import org.eclipse.osee.orcs.core.internal.proxy.ExternalArtifactManager; -import org.eclipse.osee.orcs.core.internal.proxy.impl.ExternalArtifactManagerImpl.ProxyProvider; import org.eclipse.osee.orcs.core.internal.relation.impl.RelationNodeAdjacencies; import org.eclipse.osee.orcs.core.internal.search.QueryModule.QueryModuleProvider; import org.eclipse.osee.orcs.data.RelationTypes; @@ -80,7 +80,6 @@ public class RelationManagerTest { @Mock private ExternalArtifactManager proxyManager; @Mock private QueryFactory factory; @Mock private QueryModuleProvider provider; - @Mock private ProxyProvider proxy; @Mock private RelationNodeLoader loader; @Mock private OrcsSession session; @@ -120,7 +119,7 @@ public class RelationManagerTest { String sessionId = GUID.create(); when(session.getGuid()).thenReturn(sessionId); - manager = RelationManagerFactory.createRelationManager(logger, types, relationFactory, loader, provider, proxy); + manager = RelationManagerFactory.createRelationManager(logger, types, relationFactory, loader, provider); when(loader.loadNodes(eq(session), eq(graph), anyCollectionOf(Integer.class), eq(LoadLevel.ALL))).thenAnswer( new LoaderAnswer()); @@ -209,6 +208,8 @@ public class RelationManagerTest { when(types.getDefaultOrderTypeGuid(Matchers.any())).thenReturn(LEXICOGRAPHICAL_DESC); when(types.getAll()).thenReturn(new ArrayList( Arrays.asList(CoreRelationTypes.Default_Hierarchical__Child, CoreRelationTypes.Default_Hierarchical__Parent))); + + when(types.get((Id) Matchers.any())).thenReturn(CoreRelationTypes.Default_Hierarchical__Child); } private void setupAdjacencies(RelationNode node, Relation... relations) throws OseeCoreException { diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationTest.java index e004ddb565a..4a2593b508c 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationTest.java @@ -17,7 +17,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.DirtyState; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.RelationSide; @@ -139,8 +139,8 @@ public class RelationTest { @Test public void testIsOfType() throws OseeCoreException { - IRelationType type1 = mock(IRelationType.class); - IRelationType type2 = mock(IRelationType.class); + RelationTypeToken type1 = mock(RelationTypeToken.class); + RelationTypeToken type2 = mock(RelationTypeToken.class); when(relationTypes.get(TYPE_UUID)).thenReturn(type1); diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidityTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidityTest.java index a3f73be0de4..a334ffa85b4 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidityTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidityTest.java @@ -26,6 +26,7 @@ import java.util.Collection; import java.util.List; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -48,7 +49,7 @@ import org.mockito.stubbing.Answer; */ public class RelationTypeValidityTest { - private static final IRelationType TYPE_1 = TokenFactory.createRelationType(123456789L, "TYPE_1"); + private static final RelationTypeToken TYPE_1 = TokenFactory.createRelationType(123456789L, "TYPE_1"); @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImplTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImplTest.java index 8eca6462547..d8d5cabf639 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImplTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImplTest.java @@ -42,7 +42,7 @@ import java.util.List; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.RelationTypeSide; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.data.TransactionId; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.enums.RelationSide; @@ -55,7 +55,6 @@ import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.internal.graph.GraphData; -import org.eclipse.osee.orcs.core.internal.proxy.impl.ExternalArtifactManagerImpl.ProxyProvider; import org.eclipse.osee.orcs.core.internal.relation.Relation; import org.eclipse.osee.orcs.core.internal.relation.RelationFactory; import org.eclipse.osee.orcs.core.internal.relation.RelationManager; @@ -66,6 +65,8 @@ import org.eclipse.osee.orcs.core.internal.relation.RelationVisitor; import org.eclipse.osee.orcs.core.internal.relation.order.OrderManager; import org.eclipse.osee.orcs.core.internal.relation.order.OrderManagerFactory; import org.eclipse.osee.orcs.core.internal.search.QueryModule.QueryModuleProvider; +import org.eclipse.osee.orcs.core.internal.types.impl.RelationTypesImpl; +import org.eclipse.osee.orcs.data.RelationTypes; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; @@ -86,7 +87,7 @@ import org.mockito.stubbing.Answer; */ public class RelationManagerImplTest { - private static final IRelationType TYPE_1 = TokenFactory.createRelationType(123456789L, "TYPE_1"); + private static final RelationTypeToken TYPE_1 = RelationTypeToken.create(123456789, "TYPE_1"); @Rule public ExpectedException thrown = ExpectedException.none(); @@ -100,7 +101,6 @@ public class RelationManagerImplTest { @Mock private RelationFactory relationFactory; @Mock private OrcsSession session; @Mock private QueryModuleProvider provider; - @Mock private ProxyProvider proxy; @Mock private GraphData graph; @@ -134,12 +134,14 @@ public class RelationManagerImplTest { @Captor private ArgumentCaptor<List<? extends Identifiable<String>>> sortedListCaptor; // @formatter:on + private final RelationTypes relationTypes = new RelationTypesImpl(null); private RelationManager manager; @Before public void setUp() { MockitoAnnotations.initMocks(this); - manager = new RelationManagerImpl(logger, validity, resolver, relationFactory, orderFactory, provider, proxy); + manager = + new RelationManagerImpl(logger, validity, resolver, relationFactory, orderFactory, provider, relationTypes); String sessionId = GUID.create(); when(session.getGuid()).thenReturn(sessionId); diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationNodeAdjacenciesTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationNodeAdjacenciesTest.java index 9b0b80feeac..f3a0725f4c8 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationNodeAdjacenciesTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationNodeAdjacenciesTest.java @@ -14,7 +14,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.collect.Iterables; @@ -22,7 +21,9 @@ import java.util.Collection; import java.util.List; import org.eclipse.osee.framework.core.data.HasLocalId; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.RelationSide; @@ -102,9 +103,9 @@ public class RelationNodeAdjacenciesTest { @Test public void testGetExistingTypes() throws OseeCoreException { - IRelationType typeA = mock(IRelationType.class); - IRelationType typeB = mock(IRelationType.class); - IRelationType typeC = mock(IRelationType.class); + RelationTypeToken typeA = CoreRelationTypes.DEFAULT_HIERARCHY; + RelationTypeToken typeB = CoreRelationTypes.Allocation__Component; + RelationTypeToken typeC = CoreRelationTypes.Dependency__Artifact; when(dirty.getRelationType()).thenReturn(typeA); when(dirty.getModificationType()).thenReturn(ModificationType.ARTIFACT_DELETED); diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java index f11a9e0727c..718d47e30c8 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.RelationTypeSide; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; @@ -91,8 +91,8 @@ public class OrderParserTest { @Captor private ArgumentCaptor<RelationTypeSide> typeSideCaptor; @Captor private ArgumentCaptor<OrderData> orderDataCaptor; - @Mock private IRelationType relationType1; - @Mock private IRelationType relationType2; + @Mock private RelationTypeToken relationType1; + @Mock private RelationTypeToken relationType2; // @formatter:on private OrderParser parser; diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImplTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImplTest.java index 10866ffb539..11dc8cf9b00 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImplTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImplTest.java @@ -42,8 +42,8 @@ import java.util.List; import org.eclipse.osee.executor.admin.CancellableCallable; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.RelationTypeSide; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; @@ -76,7 +76,7 @@ import org.mockito.Mockito; */ public class TransactionBuilderImplTest { - private static final IRelationType TYPE_1 = TokenFactory.createRelationType(123456789L, "TYPE_1"); + private static final RelationTypeToken TYPE_1 = TokenFactory.createRelationType(123456789L, "TYPE_1"); @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java index 3267b106d87..817cc122fdb 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java @@ -16,6 +16,7 @@ import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHIC import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC; import static org.eclipse.osee.framework.core.enums.RelationSorter.UNORDERED; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; import com.google.common.collect.ArrayListMultimap; @@ -37,7 +38,7 @@ import java.util.List; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity; @@ -88,8 +89,8 @@ public class OrcsTypesTest { private static final IAttributeType FIELD_1 = TokenFactory.createAttributeType(0x1000000000000080L, "Field 1"); private static final IAttributeType FIELD_2 = TokenFactory.createAttributeType(0x1000000000000081L, "Field 2"); - private static final IRelationType REQUIREMENT_REL = TokenFactory.createRelationType(0x2000000000000157L, "Requirement Relation"); - private static final IRelationType ANOTHER_REL = TokenFactory.createRelationType(0x2000000000000158L, "Another Relation"); + private static final RelationTypeToken REQUIREMENT_REL = TokenFactory.createRelationType(0x2000000000000157L, "Requirement Relation"); + private static final RelationTypeToken ANOTHER_REL = TokenFactory.createRelationType(0x2000000000000158L, "Another Relation"); static long BRANCH_A_UUID = 3458234234L; static long BRANCH_B_UUID = 9993245332L; @@ -765,8 +766,8 @@ public class OrcsTypesTest { public void testExistsRelationTypes() throws OseeCoreException { RelationTypes relTypes = orcsTypes.getRelationTypes(); - assertEquals(true, relTypes.exists(REQUIREMENT_REL)); - assertEquals(true, relTypes.exists(ANOTHER_REL)); + assertTrue(relTypes.exists(REQUIREMENT_REL)); + assertTrue(relTypes.exists(ANOTHER_REL)); } @Test @@ -921,7 +922,7 @@ public class OrcsTypesTest { assertEquals(3, relTypes.size()); - IRelationType relation = relTypes.get(0x2000000000000159L); + RelationTypeToken relation = relTypes.get(0x2000000000000159L); assertEquals("Dynamic Relation", relation.getName()); assertEquals(Long.valueOf(0x2000000000000159L), relation.getId()); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java index 98832facbd4..9548c580ba8 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.orcs.core.internal; +import com.google.common.collect.Sets; import java.util.Collections; import java.util.Set; import java.util.concurrent.Callable; @@ -35,7 +36,6 @@ import org.eclipse.osee.orcs.OrcsTypes; import org.eclipse.osee.orcs.SystemPreferences; import org.eclipse.osee.orcs.core.ds.DataModule; import org.eclipse.osee.orcs.core.ds.OrcsDataStore; -import org.eclipse.osee.orcs.core.internal.artifact.Artifact; import org.eclipse.osee.orcs.core.internal.artifact.ArtifactFactory; import org.eclipse.osee.orcs.core.internal.attribute.AttributeClassRegistry; import org.eclipse.osee.orcs.core.internal.attribute.AttributeClassResolver; @@ -48,7 +48,6 @@ import org.eclipse.osee.orcs.core.internal.graph.impl.GraphFactoryImpl; import org.eclipse.osee.orcs.core.internal.indexer.IndexerModule; import org.eclipse.osee.orcs.core.internal.proxy.ExternalArtifactManager; import org.eclipse.osee.orcs.core.internal.proxy.impl.ExternalArtifactManagerImpl; -import org.eclipse.osee.orcs.core.internal.proxy.impl.ExternalArtifactManagerImpl.ProxyProvider; import org.eclipse.osee.orcs.core.internal.relation.RelationFactory; import org.eclipse.osee.orcs.core.internal.relation.RelationManager; import org.eclipse.osee.orcs.core.internal.relation.RelationManagerFactory; @@ -76,7 +75,6 @@ import org.eclipse.osee.orcs.search.BranchQuery; import org.eclipse.osee.orcs.search.QueryFactory; import org.eclipse.osee.orcs.search.QueryIndexer; import org.eclipse.osee.orcs.transaction.TransactionFactory; -import com.google.common.collect.Sets; /** * @author Roberto E. Escobar @@ -180,18 +178,9 @@ public class OrcsApiImpl implements OrcsApi { }; - ProxyProvider proxyProvider = new ProxyProvider() { - - @Override - public Artifact getInternalArtifact(ArtifactReadable external) { - return proxyManager.asInternalArtifact(external); - } - - }; - RelationNodeLoader nodeLoader = new RelationNodeLoaderImpl(module.getDataLoaderFactory(), graphBuilderFactory); RelationManager relationManager = RelationManagerFactory.createRelationManager(logger, - orcsTypes.getRelationTypes(), relationFactory, nodeLoader, queryModuleProvider, proxyProvider); + orcsTypes.getRelationTypes(), relationFactory, nodeLoader, queryModuleProvider); TupleFactory tupleFactory = new TupleFactory(module.getDataFactory()); TupleManager tupleManager = TupleManagerFactory.createTupleManager(tupleFactory); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeRelationTypeCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeRelationTypeCommand.java index 269f3a34aba..a7f75bb86a8 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeRelationTypeCommand.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeRelationTypeCommand.java @@ -17,6 +17,7 @@ import org.eclipse.osee.console.admin.Console; import org.eclipse.osee.console.admin.ConsoleCommand; import org.eclipse.osee.console.admin.ConsoleParameters; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.HexUtil; @@ -84,7 +85,7 @@ public class PurgeRelationTypeCommand implements ConsoleCommand { for (String uuid : typesToPurge) { try { Long typeId = HexUtil.toLong(uuid); - IRelationType type = relationTypes.get(typeId); + RelationTypeToken type = relationTypes.get(typeId); console.writeln("Type [%s] found. Id: [%s]", type.getName(), type.getId()); toReturn.add(type); } catch (OseeArgumentException ex) { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/Relation.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/Relation.java index 76c67147fe1..63a788042ef 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/Relation.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/Relation.java @@ -12,6 +12,7 @@ package org.eclipse.osee.orcs.core.internal.relation; import org.eclipse.osee.framework.core.data.ApplicabilityId; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -45,7 +46,7 @@ public class Relation implements HasOrcsData<RelationData>, OrcsWriteable { this.relationData = data; } - public IRelationType getRelationType() throws OseeCoreException { + public RelationTypeToken getRelationType() throws OseeCoreException { return relationTypes.get(getOrcsData().getTypeUuid()); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerFactory.java index 033bc8b310d..fa2c2459a36 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerFactory.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerFactory.java @@ -11,7 +11,6 @@ package org.eclipse.osee.orcs.core.internal.relation; import org.eclipse.osee.logger.Log; -import org.eclipse.osee.orcs.core.internal.proxy.impl.ExternalArtifactManagerImpl.ProxyProvider; import org.eclipse.osee.orcs.core.internal.relation.impl.RelationManagerImpl; import org.eclipse.osee.orcs.core.internal.relation.impl.RelationResolverImpl; import org.eclipse.osee.orcs.core.internal.relation.order.OrderManagerFactory; @@ -29,7 +28,7 @@ public final class RelationManagerFactory { // Static Factory } - public static RelationManager createRelationManager(Log logger, RelationTypes relationTypes, RelationFactory relationFactory, RelationNodeLoader loader, QueryModuleProvider provider, ProxyProvider proxy) { + public static RelationManager createRelationManager(Log logger, RelationTypes relationTypes, RelationFactory relationFactory, RelationNodeLoader loader, QueryModuleProvider provider) { OrderParser orderParser = new OrderParser(relationTypes); SorterProvider sorterProvider = new SorterProvider(relationTypes); OrderManagerFactory orderManagerFactory = new OrderManagerFactory(orderParser, sorterProvider); @@ -37,6 +36,7 @@ public final class RelationManagerFactory { RelationResolver resolver = new RelationResolverImpl(loader); RelationTypeValidity validity = new RelationTypeValidity(relationTypes); - return new RelationManagerImpl(logger, validity, resolver, relationFactory, orderManagerFactory, provider, proxy); + return new RelationManagerImpl(logger, validity, resolver, relationFactory, orderManagerFactory, provider, + relationTypes); } } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidity.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidity.java index 94d5d3608fe..f3b696fe710 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidity.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidity.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.List; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; @@ -37,7 +38,7 @@ public class RelationTypeValidity { this.relationTypes = relationTypes; } - public void checkRelationTypeMultiplicity(IRelationType type, RelationNode node, RelationSide side, int count) throws OseeCoreException { + public void checkRelationTypeMultiplicity(RelationTypeToken type, RelationNode node, RelationSide side, int count) throws OseeCoreException { MultiplicityState state = getRelationMultiplicityState(type, side, count); switch (state) { case MAX_VIOLATION: @@ -78,7 +79,7 @@ public class RelationTypeValidity { return toReturn; } - public MultiplicityState getRelationMultiplicityState(IRelationType type, RelationSide side, int count) throws OseeCoreException { + public MultiplicityState getRelationMultiplicityState(RelationTypeToken type, RelationSide side, int count) throws OseeCoreException { Conditions.checkNotNull(type, "type"); Conditions.checkNotNull(side, "relationSide"); checkTypeExists(type); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java index e1d400e46ec..81769965c6c 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java @@ -10,15 +10,15 @@ *******************************************************************************/ package org.eclipse.osee.orcs.core.internal.relation.impl; -import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; -import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED; -import static org.eclipse.osee.framework.core.enums.RelationSorter.PREEXISTING; -import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED; import static org.eclipse.osee.framework.core.enums.CoreRelationTypes.DEFAULT_HIERARCHY; import static org.eclipse.osee.framework.core.enums.CoreRelationTypes.IS_CHILD; import static org.eclipse.osee.framework.core.enums.CoreRelationTypes.IS_PARENT; +import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; +import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED; import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_A; import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_B; +import static org.eclipse.osee.framework.core.enums.RelationSorter.PREEXISTING; +import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED; import static org.eclipse.osee.framework.jdk.core.util.Conditions.checkNotNull; import static org.eclipse.osee.framework.jdk.core.util.Strings.emptyString; import static org.eclipse.osee.orcs.core.internal.util.OrcsConditions.checkBranch; @@ -37,6 +37,7 @@ import org.eclipse.osee.framework.core.data.ApplicabilityId; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.RelationTypeSide; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; @@ -49,7 +50,6 @@ import org.eclipse.osee.framework.jdk.core.util.Conditions; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.core.internal.graph.GraphData; -import org.eclipse.osee.orcs.core.internal.proxy.impl.ExternalArtifactManagerImpl.ProxyProvider; import org.eclipse.osee.orcs.core.internal.relation.Relation; import org.eclipse.osee.orcs.core.internal.relation.RelationFactory; import org.eclipse.osee.orcs.core.internal.relation.RelationManager; @@ -62,6 +62,7 @@ import org.eclipse.osee.orcs.core.internal.relation.order.OrderManager; import org.eclipse.osee.orcs.core.internal.relation.order.OrderManagerFactory; import org.eclipse.osee.orcs.core.internal.search.QueryModule.QueryModuleProvider; import org.eclipse.osee.orcs.data.ArtifactReadable; +import org.eclipse.osee.orcs.data.RelationTypes; /** * @author Andrew M. Finkbeiner @@ -75,17 +76,16 @@ public class RelationManagerImpl implements RelationManager { private final RelationFactory relationFactory; private final OrderManagerFactory orderFactory; private final QueryModuleProvider provider; - private final ProxyProvider proxy; + private final RelationTypes relationTypes; - public RelationManagerImpl(Log logger, RelationTypeValidity validity, RelationResolver resolver, RelationFactory relationFactory, OrderManagerFactory orderFactory, QueryModuleProvider queryProvider, ProxyProvider proxyProvider) { - super(); + public RelationManagerImpl(Log logger, RelationTypeValidity validity, RelationResolver resolver, RelationFactory relationFactory, OrderManagerFactory orderFactory, QueryModuleProvider queryProvider, RelationTypes relationTypes) { this.logger = logger; this.validity = validity; this.resolver = resolver; this.relationFactory = relationFactory; this.orderFactory = orderFactory; this.provider = queryProvider; - this.proxy = proxyProvider; + this.relationTypes = relationTypes; } @Override @@ -131,7 +131,7 @@ public class RelationManagerImpl implements RelationManager { toReturn = container.getExistingTypes(DeletionFlag.EXCLUDE_DELETED); } else { logger.warn("Unable to find relation container for [%s]", node.getExceptionString()); - toReturn = Collections.<IRelationType> emptyList(); + toReturn = Collections.emptyList(); } return toReturn; } @@ -179,7 +179,7 @@ public class RelationManagerImpl implements RelationManager { result = resolver.resolve(session, graph, links, otherSide); if (result.size() > 1) { OrderManager orderManager = orderFactory.createOrderManager(node); - RelationTypeSide key = RelationTypeSide.create(type, otherSide); + RelationTypeSide key = RelationTypeSide.create(relationTypes.get(type), otherSide); orderManager.sort(key, result); } } @@ -269,16 +269,16 @@ public class RelationManagerImpl implements RelationManager { int bSideMax = validity.getMaximumRelationsAllowed(type, bNode.getArtifactType(), SIDE_B); if (bSideCount >= bSideMax) { - throw new OseeStateException("Relation type [%s] on [%s] exceeds max occurrence rule on [%s]", type.getName(), - SIDE_B, aNode.getExceptionString()); + throw new OseeStateException("Relation type [%s] on [%s] exceeds max occurrence rule on [%s]", type, SIDE_B, + aNode.getExceptionString()); } int aSideCount = getRelations(session, type, bNode, SIDE_B, EXCLUDE_DELETED).size(); int aSideMax = validity.getMaximumRelationsAllowed(type, aNode.getArtifactType(), SIDE_A); if (aSideCount >= aSideMax) { - throw new OseeStateException("Relation type [%s] on [%s] exceeds max occurrence rule on [%s]", type.getName(), - SIDE_A, bNode.getExceptionString()); + throw new OseeStateException("Relation type [%s] on [%s] exceeds max occurrence rule on [%s]", type, SIDE_A, + bNode.getExceptionString()); } } @@ -340,10 +340,10 @@ public class RelationManagerImpl implements RelationManager { node.delete(); if (relations != null && !relations.isEmpty()) { - Map<IRelationType, RelationSide> typesToRemove = new HashMap<>(); + Map<RelationTypeToken, RelationSide> typesToRemove = new HashMap<>(); for (Relation relation : relations) { relation.delete(); - IRelationType type = relation.getRelationType(); + RelationTypeToken type = relation.getRelationType(); RelationSide otherSide = relation.getLocalIdForSide(SIDE_A) == node.getLocalId() ? SIDE_B : SIDE_A; typesToRemove.put(type, otherSide); } @@ -351,8 +351,8 @@ public class RelationManagerImpl implements RelationManager { if (!typesToRemove.isEmpty()) { OrderManager orderManager = orderFactory.createOrderManager(node); - for (Entry<IRelationType, RelationSide> entry : typesToRemove.entrySet()) { - IRelationType type = entry.getKey(); + for (Entry<RelationTypeToken, RelationSide> entry : typesToRemove.entrySet()) { + RelationTypeToken type = entry.getKey(); RelationSide side = entry.getValue(); List<Relation> sideLinks = getRelations(session, type, node, side, EXCLUDE_DELETED); @@ -434,7 +434,7 @@ public class RelationManagerImpl implements RelationManager { OrderManager orderManager = orderFactory.createOrderManager(node1); RelationSide orderSide = side.oppositeSide(); - RelationTypeSide key = RelationTypeSide.create(type, orderSide); + RelationTypeSide key = RelationTypeSide.create(relationTypes.get(type), orderSide); RelationSorter sorterIdToUse = sorterId; if (sorterIdToUse == PREEXISTING) { sorterIdToUse = orderManager.getSorterId(key); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java index 66852b5c57f..2cdac7f1ef5 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java @@ -26,8 +26,8 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; -import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.RelationTypeSide; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -110,9 +110,9 @@ public class OrderParser { } // TODO don't store relation type by name - use type UUID - IRelationType type = Iterables.find(relationCache.getAll(), new Predicate<IRelationType>() { + RelationTypeToken type = Iterables.find(relationCache.getAll(), new Predicate<RelationTypeToken>() { @Override - public boolean apply(IRelationType type) { + public boolean apply(RelationTypeToken type) { return type.getName().equalsIgnoreCase(relationTypeName); } }); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java index b74178e5dda..59c0877c857 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java @@ -27,6 +27,7 @@ import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.RelationTypeSide; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.BranchType; @@ -139,9 +140,9 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter { } } - private IRelationType getRelationType(String name) { - IRelationType toReturn = null; - for (IRelationType type : orcsTypes.getRelationTypes().getAll()) { + private RelationTypeToken getRelationType(String name) { + RelationTypeToken toReturn = null; + for (RelationTypeToken type : orcsTypes.getRelationTypes().getAll()) { if (type.getName().equals(name)) { toReturn = type; break; @@ -693,7 +694,7 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter { Class<?> clazz = resolver.resolveTypeSingle(expression); if (clazz.isAssignableFrom(String.class)) { String name = resolver.resolveSingle(String.class, expression); - IRelationType type = getRelationType(name); + RelationTypeToken type = getRelationType(name); toReturn = RelationTypeSide.create(type, asSide(side)); } else { long typeId = resolver.resolveSingle(Long.class, expression); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java index 2cb67699a60..e1188896222 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java @@ -21,10 +21,11 @@ import java.util.List; import java.util.Map; import java.util.Set; import org.eclipse.emf.common.util.EList; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.dsl.OseeDslResource; import org.eclipse.osee.framework.core.dsl.OseeDslResourceUtil; @@ -147,8 +148,7 @@ public class OrcsTypesIndexer { } private void indexAttributes(ArtifactTypeIndex artifactTypeIndex, AttributeTypeIndex attributeTypeIndex, XArtifactType dslType) throws OseeCoreException { - Map<BranchId, Collection<IAttributeType>> validAttributes = - new HashMap<BranchId, Collection<IAttributeType>>(); + Map<BranchId, Collection<IAttributeType>> validAttributes = new HashMap<BranchId, Collection<IAttributeType>>(); for (XAttributeTypeRef xAttributeTypeRef : dslType.getValidAttributeTypes()) { XAttributeType xAttributeType = xAttributeTypeRef.getValidAttributeType(); BranchId branch = getAttributeBranch(xAttributeTypeRef); @@ -190,7 +190,7 @@ public class OrcsTypesIndexer { } private IRelationType getOrCreateToken(RelationTypeIndex index, XRelationType dslType) throws OseeCoreException { - IRelationType token = index.getTokenByDslType(dslType); + RelationTypeToken token = index.getTokenByDslType(dslType); if (token == null) { long id = HexUtil.toLong(dslType.getUuid()); token = TokenFactory.createRelationType(id, dslType.getName()); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypeIndex.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypeIndex.java index e7dd6fbe43b..9bd44f13b4c 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypeIndex.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypeIndex.java @@ -12,6 +12,7 @@ package org.eclipse.osee.orcs.core.internal.types.impl; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.dsl.oseeDsl.XArtifactType; import org.eclipse.osee.framework.core.dsl.oseeDsl.XRelationType; import org.eclipse.osee.framework.core.enums.RelationSide; @@ -19,7 +20,7 @@ import org.eclipse.osee.framework.core.enums.RelationSide; /** * @author Roberto E. Escobar */ -public class RelationTypeIndex extends TokenTypeIndex<IRelationType, XRelationType> { +public class RelationTypeIndex extends TokenTypeIndex<RelationTypeToken, XRelationType> { private final ArtifactTypeIndex artifactTypeIndex; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypesImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypesImpl.java index 2461e53ee41..28b85ba162f 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypesImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypesImpl.java @@ -13,6 +13,7 @@ package org.eclipse.osee.orcs.core.internal.types.impl; import java.util.Collection; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.dsl.oseeDsl.XRelationType; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; @@ -44,17 +45,20 @@ public class RelationTypesImpl implements RelationTypes { } @Override - public Collection<? extends IRelationType> getAll() throws OseeCoreException { + public Collection<? extends RelationTypeToken> getAll() throws OseeCoreException { return provider.getRelationTypeIndex().getAllTokens(); } @Override - public IRelationType get(Id id) { + public RelationTypeToken get(Id id) { + if (id instanceof RelationTypeToken) { + return (RelationTypeToken) id; + } return provider.getRelationTypeIndex().get(id); } @Override - public IRelationType get(Long id) { + public RelationTypeToken get(Long id) { return provider.getRelationTypeIndex().get(id); } diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterCollectorGenerator.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterCollectorGenerator.java index 0d24799619d..eb192f4947b 100644 --- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterCollectorGenerator.java +++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterCollectorGenerator.java @@ -20,7 +20,7 @@ import java.util.Map; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.CoreArtifactTokens; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -220,15 +220,15 @@ public class OrcsWriterCollectorGenerator { } private void createRelationTypeSheet() { - Map<String, IRelationType> types = new HashMap<>(100); + Map<String, RelationTypeToken> types = new HashMap<>(100); if (config == null) { - for (IRelationType type : orcsApi.getOrcsTypes().getRelationTypes().getAll()) { + for (RelationTypeToken type : orcsApi.getOrcsTypes().getRelationTypes().getAll()) { types.put(type.getName(), type); } } else { for (OrcsWriterRelationSide token : config.getIncludeRelationTypes()) { Long relationTypeUuid = token.getRelationTypeUuid(); - IRelationType type = orcsApi.getOrcsTypes().getRelationTypes().get(relationTypeUuid); + RelationTypeToken type = orcsApi.getOrcsTypes().getRelationTypes().get(relationTypeUuid); if (type != null) { types.put(type.getName(), type); } @@ -239,12 +239,12 @@ public class OrcsWriterCollectorGenerator { typeNames.addAll(types.keySet()); Collections.sort(typeNames); for (String typeName : typeNames) { - IRelationType type = types.get(typeName); + RelationTypeToken type = types.get(typeName); writeRelationType(type); } } - private void writeRelationType(IRelationType type) { + private void writeRelationType(RelationTypeToken type) { String sideAName = orcsApi.getOrcsTypes().getRelationTypes().getSideAName(type); OwRelationType owType = OwFactory.createRelationType(type, sideAName, true); collector.getRelTypes().add(owType); diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java index 3cd58f26f46..fe1ce9ab5db 100644 --- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java +++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java @@ -17,8 +17,8 @@ import org.eclipse.osee.framework.core.data.ArtifactToken; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.RelationTypeSide; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.orcs.OrcsApi; import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifact; @@ -62,7 +62,7 @@ public class OwFactory { return owToken; } - public static OwRelationType createRelationType(IRelationType relType, String sideName, boolean sideA) { + public static OwRelationType createRelationType(RelationTypeToken relType, String sideName, boolean sideA) { String sideData = String.format("[%s]-[%s]-[Side %s]-[%s]", relType.getName(), sideName, sideA ? "A" : "B", relType.getId()); OwRelationType owType = new OwRelationType(); diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/RelationTypes.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/RelationTypes.java index 13797415f7e..8096c267530 100644 --- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/RelationTypes.java +++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/RelationTypes.java @@ -12,6 +12,7 @@ package org.eclipse.osee.orcs.data; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationType; +import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.enums.RelationSorter; import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity; @@ -21,7 +22,7 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; /** * @author Roberto E. Escobar */ -public interface RelationTypes extends IdCollection<IRelationType> { +public interface RelationTypes extends IdCollection<RelationTypeToken> { RelationTypeMultiplicity getMultiplicity(IRelationType relation) throws OseeCoreException; |