diff options
81 files changed, 159 insertions, 239 deletions
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java index d7e109e5a3d..f59346b4692 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java @@ -39,7 +39,6 @@ import org.eclipse.osee.ats.util.AtsBranchManager; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.BranchArchivedState; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -72,8 +71,8 @@ import org.junit.Before; */ public class AtsBranchConfigurationTest { - public static final IOseeBranch BRANCH_VIA_TEAM_DEFINITION = TokenFactory.createBranch("BranchViaTeamDef"); - public static final IOseeBranch BRANCH_VIA_VERSIONS = TokenFactory.createBranch("BranchViaVersions"); + public static final IOseeBranch BRANCH_VIA_TEAM_DEFINITION = IOseeBranch.create("BranchViaTeamDef"); + public static final IOseeBranch BRANCH_VIA_VERSIONS = IOseeBranch.create("BranchViaVersions"); private final boolean DEBUG = false; private static Collection<String> appendToName(IOseeBranch branch, String... postFixes) { @@ -355,8 +354,7 @@ public class AtsBranchConfigurationTest { for (Artifact teamDefArt : ArtifactQuery.getArtifactListFromTypeAndName(AtsArtifactTypes.TeamDefinition, branch.getName(), AtsUtilCore.getAtsBranch())) { teamDefArt.deleteAndPersist(transaction, false); - IAtsTeamDefinition soleByUuid = - AtsClientService.get().getCache().getAtsObject(teamDefArt.getId()); + IAtsTeamDefinition soleByUuid = AtsClientService.get().getCache().getAtsObject(teamDefArt.getId()); if (soleByUuid != null) { AtsClientService.get().getCache().deCacheAtsObject(soleByUuid); } @@ -369,8 +367,7 @@ public class AtsBranchConfigurationTest { branch.getName(), AtsUtilCore.getAtsBranch())) { for (Artifact childArt : aiaArt.getChildren()) { childArt.deleteAndPersist(transaction, false); - IAtsActionableItem soleByUuid = - AtsClientService.get().getCache().getAtsObject(childArt.getId()); + IAtsActionableItem soleByUuid = AtsClientService.get().getCache().getAtsObject(childArt.getId()); if (soleByUuid != null) { AtsClientService.get().getCache().deCacheAtsObject(soleByUuid); } @@ -378,8 +375,7 @@ public class AtsBranchConfigurationTest { aiaArt.deleteAndPersist(transaction, false); - IAtsActionableItem ai = - AtsClientService.get().getCache().getAtsObject(aiaArt.getId()); + IAtsActionableItem ai = AtsClientService.get().getCache().getAtsObject(aiaArt.getId()); if (ai != null) { AtsClientService.get().getCache().deCacheAtsObject(ai); } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/AtsVersionServiceImpl.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/AtsVersionServiceImpl.java index 30e06f9e5c2..73443917189 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/AtsVersionServiceImpl.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/store/AtsVersionServiceImpl.java @@ -28,7 +28,6 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.version.AbstractAtsVersionServiceImpl; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; import org.eclipse.osee.framework.logging.OseeLog; @@ -122,7 +121,7 @@ public class AtsVersionServiceImpl extends AbstractAtsVersionServiceImpl impleme BranchId branch = null; Long branchUuid = getBranchId(version); if (branchUuid != null && branchUuid > 0) { - branch = TokenFactory.createBranch(branchUuid); + branch = BranchId.valueOf(branchUuid); } return branch; } diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java index 1a762eece33..2ec9d766a70 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java @@ -40,7 +40,7 @@ import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.rest.IAtsServer; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.ArtifactToken; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.CoreArtifactTokens; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; @@ -167,7 +167,7 @@ public final class AtsConfigEndpointImpl implements AtsConfigEndpointApi { // Create new baseline branch off Root Callable<BranchReadable> newBranchCallable = - orcsApi.getBranchOps().createTopLevelBranch(TokenFactory.createBranch(newBranchName), user); + orcsApi.getBranchOps().createTopLevelBranch(IOseeBranch.create(newBranchName), user); BranchReadable newBranch; try { newBranch = newBranchCallable.call(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigPreferencePage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigPreferencePage.java index 363daf295a2..66404fc750c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigPreferencePage.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigPreferencePage.java @@ -18,7 +18,6 @@ import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; @@ -67,7 +66,7 @@ public class AtsConfigPreferencePage extends PreferencePage implements IWorkbenc if (dialog.open() == 0) { AtsConfiguration config = (AtsConfiguration) dialog.getResult()[0]; - BranchId branch = TokenFactory.createBranch(config.getBranchUuid()); + BranchId branch = BranchId.valueOf(config.getBranchUuid()); AtsUtilCore.storeAtsBranch(branch, config.getName()); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java index 256013defb2..245f742e8fa 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java @@ -54,7 +54,6 @@ import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.world.WorldXNavigateItemAction; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.exception.BranchDoesNotExist; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.AttributeType; @@ -666,8 +665,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { continue; } if (art.isOfType(AtsArtifactTypes.TeamDefinition)) { - IAtsTeamDefinition teamDef = - AtsClientService.get().getCache().getAtsObject(art.getId()); + IAtsTeamDefinition teamDef = AtsClientService.get().getCache().getAtsObject(art.getId()); try { long parentBranchUuid = teamDef.getBaselineBranchUuid(); if (parentBranchUuid > 0) { @@ -766,7 +764,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { public static void validateBranchUuid(IAtsConfigObject name, long parentBranchUuid, ValidateResults results) { Date date = new Date(); try { - BranchId branch = TokenFactory.createBranch(parentBranchUuid); + BranchId branch = BranchId.valueOf(parentBranchUuid); if (BranchManager.isArchived(branch)) { results.log("validateBranchUuid", String.format( @@ -999,8 +997,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { } try { if (artifact.isOfType(AtsArtifactTypes.ActionableItem)) { - IAtsActionableItem aia = - AtsClientService.get().getCache().getAtsObject(artifact.getId()); + IAtsActionableItem aia = AtsClientService.get().getCache().getAtsObject(artifact.getId()); if (aia.isActionable() && TeamDefinitions.getImpactedTeamDefs(Arrays.asList(aia)).isEmpty()) { results.log(artifact, "testActionableItemToTeamDefinition", "Error: ActionableItem " + XResultDataUI.getHyperlink(artifact.getName(), diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java index 5a50d4b9601..748d91eb478 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java @@ -49,7 +49,7 @@ import org.eclipse.osee.ats.world.WorldEditorUISearchItemProvider; import org.eclipse.osee.ats.world.search.GroupWorldSearchItem; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.data.ArtifactId; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.PresentationType; import org.eclipse.osee.framework.core.enums.QueryOption; @@ -173,7 +173,7 @@ public final class AtsUtil { public static void openArtifact(String guid, Long branchUuid, OseeCmEditor view) { try { - Artifact artifact = ArtifactQuery.getArtifactFromId(guid, TokenFactory.createBranch(branchUuid)); + Artifact artifact = ArtifactQuery.getArtifactFromId(guid, BranchId.valueOf(branchUuid)); openATSAction(artifact, AtsOpenOption.OpenOneOrPopupSelect); } catch (Exception ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/TeamBasedDefaultBranchProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/TeamBasedDefaultBranchProvider.java index 444cad743c5..bd372b7cd3a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/TeamBasedDefaultBranchProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/TeamBasedDefaultBranchProvider.java @@ -20,7 +20,6 @@ import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -43,7 +42,7 @@ public class TeamBasedDefaultBranchProvider implements IDefaultInitialBranchesPr Collection<BranchId> branches = new LinkedList<>(); for (IAtsTeamDefinition team : teams) { - branches.add(TokenFactory.createBranch(team.getTeamBranchUuid())); + branches.add(BranchId.valueOf(team.getTeamBranchUuid())); } return branches; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java index a0a3749a050..354a651d532 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java @@ -24,7 +24,6 @@ import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TransactionToken; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; @@ -111,7 +110,7 @@ public class XCommitLabelProvider extends XViewerLabelProvider { if (!AtsClientService.get().getBranchService().isBranchValid(configArt)) { return String.format("Branch not configured for [%s]", element); } else { - branch = TokenFactory.createBranch(configArt.getBaselineBranchUuid()); + branch = BranchId.valueOf(configArt.getBaselineBranchUuid()); } } else if (element instanceof TransactionToken) { TransactionToken txRecord = (TransactionToken) element; diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/ImportTraceUnitsOperationTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/ImportTraceUnitsOperationTest.java index 1f60bcae7da..54b61173069 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/ImportTraceUnitsOperationTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/ImportTraceUnitsOperationTest.java @@ -26,7 +26,6 @@ import org.eclipse.osee.client.test.framework.TestInfo; import org.eclipse.osee.define.traceability.operations.ImportTraceUnitsOperation; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.operation.IOperation; @@ -94,7 +93,7 @@ public final class ImportTraceUnitsOperationTest { @Before public void setup() throws Exception { - branch = TokenFactory.createBranch(testInfo.getQualifiedTestName()); + branch = IOseeBranch.create(testInfo.getQualifiedTestName()); importToBranch = BranchManager.createWorkingBranch(SAW_Bld_1, branch); setupDirectoryStructure(); diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactPurgeTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactPurgeTest.java index 0097aefb9ae..341480afde2 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactPurgeTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactPurgeTest.java @@ -20,7 +20,6 @@ import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.client.test.framework.TestInfo; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.operation.Operations; @@ -62,7 +61,7 @@ public class ArtifactPurgeTest { @Before public void setup() throws OseeCoreException { - workingBranch = TokenFactory.createBranch(method.getQualifiedTestName()); + workingBranch = IOseeBranch.create(method.getQualifiedTestName()); BranchManager.createWorkingBranch(SAW_Bld_2, workingBranch); } diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/AttributeResourceTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/AttributeResourceTest.java index fd2be5d1c73..93a99d68f29 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/AttributeResourceTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/AttributeResourceTest.java @@ -21,7 +21,6 @@ import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.client.test.framework.TestInfo; import org.eclipse.osee.framework.core.client.OseeClientProperties; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TransactionId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -56,7 +55,7 @@ public class AttributeResourceTest { @Before public void setup() throws OseeCoreException { - workingBranch = TokenFactory.createBranch(testInfo.getQualifiedTestName()); + workingBranch = IOseeBranch.create(testInfo.getQualifiedTestName()); BranchManager.createWorkingBranch(SAW_Bld_2, workingBranch); } diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java index 042fc2783ac..c74ca62c9ba 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java @@ -67,7 +67,7 @@ public class BranchEventTest { @Before public void setup() { String topLevelBranchName = String.format("%s_TOP_LEVEL", method.getQualifiedTestName()); - mainBranch = TokenFactory.createBranch(topLevelBranchName); + mainBranch = IOseeBranch.create(topLevelBranchName); branchEventListener = new BranchEventListener(); } diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchPurgeTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchPurgeTest.java index 1987f3f825d..ece4dc0bd7e 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchPurgeTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchPurgeTest.java @@ -63,7 +63,7 @@ public class BranchPurgeTest { @Before public void setup() { - workingBranch = TokenFactory.createBranch(method.getQualifiedTestName()); + workingBranch = IOseeBranch.create(method.getQualifiedTestName()); txEndpoint = ServiceUtil.getOseeClient().getTransactionEndpoint(); } diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictIntroduceTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictIntroduceTest.java index 85abf97b79b..ddae42768ac 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictIntroduceTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictIntroduceTest.java @@ -175,7 +175,7 @@ public class ConflictIntroduceTest { private static IOseeBranch createBranchToken(String name) { String branchName = String.format("%s__%s", TESTNAME, name); - return TokenFactory.createBranch(branchName); + return IOseeBranch.create(branchName); } } diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/WordMlLinkHandlerTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/WordMlLinkHandlerTest.java index e1707425bac..cd5e196fb95 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/WordMlLinkHandlerTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/WordMlLinkHandlerTest.java @@ -118,7 +118,7 @@ public class WordMlLinkHandlerTest { @Test public void testDetectMissingGuids() throws IOException { - IOseeBranch workingBranch = TokenFactory.createBranch(method.getQualifiedTestName()); + IOseeBranch workingBranch = IOseeBranch.create(method.getQualifiedTestName()); try { BranchManager.createWorkingBranch(SAW_Bld_2, workingBranch); Artifact addArtifact = ArtifactTypeManager.addArtifact(CoreArtifactTypes.SoftwareRequirement, workingBranch); diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/InterArtifactDropTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/InterArtifactDropTest.java index ed6bba8666e..9bf8148bad3 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/InterArtifactDropTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/InterArtifactDropTest.java @@ -281,6 +281,6 @@ public class InterArtifactDropTest { private IOseeBranch createBranchToken(String name) { String branchName = String.format("%s__%s", method.getQualifiedTestName(), name); - return TokenFactory.createBranch(branchName); + return IOseeBranch.create(branchName); } } diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java index ff6063f5028..c933802122c 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java @@ -18,7 +18,7 @@ import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.framework.access.AccessControlManager; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; @@ -73,7 +73,7 @@ public class RelationIntegrityCheckTest { Artifact art_A = ArtifactTypeManager.addArtifact(CoreArtifactTypes.Folder, parentBranch, "A"); art_A.persist(getClass().getSimpleName()); - workingBranch = BranchManager.createWorkingBranch(parentBranch, TokenFactory.createBranch("2")); + workingBranch = BranchManager.createWorkingBranch(parentBranch, IOseeBranch.create("2")); art_A.deleteAndPersist(); diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/WordTemplateProcessorTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/WordTemplateProcessorTest.java index 592b41ad9df..7c180494c0a 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/WordTemplateProcessorTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/WordTemplateProcessorTest.java @@ -80,7 +80,7 @@ public class WordTemplateProcessorTest { @Before public void setUp() throws Exception { - branch = TokenFactory.createBranch(method.getQualifiedTestName()); + branch = IOseeBranch.create(method.getQualifiedTestName()); BranchManager.createWorkingBranch(SAW_Bld_1, branch); myRootArtifact = diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionTestUtil.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionTestUtil.java index ad5c7c47fce..7cc0f6a98fb 100644 --- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionTestUtil.java +++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionTestUtil.java @@ -25,6 +25,6 @@ public class DispositionTestUtil { public static final ArtifactToken DISPO_ITEM_DEV_ONE = TokenFactory.createArtifactToken(8702337, "BJEiM7sbfDZjtkJ9JSAA", "Dispo Item Dev One", DispoConstants.DispoItem); public static final ArtifactToken DISPO_ITEM_DEMO_ONE = TokenFactory.createArtifactToken(4132534, "BJEiNETyAGTDpW4ZnrAA", "Dispo Item Demo One", DispoConstants.DispoItem); - public static final IOseeBranch SAW_Bld_1_FOR_DISPO = TokenFactory.createBranch("SAW_Bld_1 - FOR_DISPOSITION"); + public static final IOseeBranch SAW_Bld_1_FOR_DISPO = IOseeBranch.create("SAW_Bld_1 - FOR_DISPOSITION"); // @formatter:on }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResourceTest.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResourceTest.java index fe043f63c88..75f67a9cd81 100644 --- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResourceTest.java +++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/resources/DispoProgramResourceTest.java @@ -62,7 +62,7 @@ public class DispoProgramResourceTest { assertEquals(Response.Status.NOT_FOUND.getStatusCode(), noProgramsResponse.getStatus()); assertEquals("[]", messageActual); - IOseeBranch branch = TokenFactory.createBranch(id1.getUuid(), "dispotestGetAll"); + IOseeBranch branch = IOseeBranch.create(id1.getUuid(), "dispotestGetAll"); List<IOseeBranch> branchList = Collections.singletonList(branch); when(dispoApi.getDispoPrograms()).thenReturn(branchList); diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java index 02c848fd5f7..fb3def3de76 100644 --- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java +++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java @@ -34,7 +34,6 @@ import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -219,7 +218,7 @@ public class OrcsStorageImpl implements Storage { public Long createDispoProgram(ArtifactReadable author, String name) { String normalizedName = "(DISPO)" + name; BranchReadable dispoBranch = getQuery().branchQuery().andNameEquals("Dispo Parent").getResults().getExactlyOne(); - IOseeBranch branch = TokenFactory.createBranch(normalizedName); + IOseeBranch branch = IOseeBranch.create(normalizedName); try { getBranchFactory().createWorkingBranch(branch, author, dispoBranch, ArtifactId.SENTINEL).call(); @@ -419,7 +418,7 @@ public class OrcsStorageImpl implements Storage { @Override public void updateDispoItem(ArtifactReadable author, DispoProgram program, String dispoItemId, DispoItem data) { - BranchId branch = TokenFactory.createBranch(program.getUuid()); + BranchId branch = BranchId.valueOf(program.getUuid()); TransactionBuilder tx = getTxFactory().createTransaction(branch, author, "Update Dispo Item"); ArtifactReadable dispoItemArt = findDispoArtifact(program, dispoItemId, DispoConstants.DispoItem); updateSingleItem(author, program, dispoItemArt, data, tx, false); @@ -447,8 +446,7 @@ public class OrcsStorageImpl implements Storage { getQuery().branchQuery().andIsOfType(BranchType.WORKING).andIsChildOf(dispoBranch).getResults(); for (BranchReadable branch : dispoBranches) { - IOseeBranch newName = - TokenFactory.createBranch(branch.getUuid(), branch.getName().replaceFirst("\\(DISPO\\)", "")); + IOseeBranch newName = IOseeBranch.create(branch, branch.getName().replaceFirst("\\(DISPO\\)", "")); dispoBranchesNormalized.add(newName); } diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java index c51bf75cee6..cb38261b978 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java @@ -16,7 +16,6 @@ import org.eclipse.osee.framework.core.data.ArtifactToken; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider.ArtifactProxy; import org.eclipse.osee.framework.core.dsl.integration.mocks.DslAsserts; import org.eclipse.osee.framework.core.dsl.integration.mocks.MockModel; @@ -267,7 +266,7 @@ public class ArtifactMatchInterpreterTest { @Override public IOseeBranch getBranchToken() { - return TokenFactory.createBranch(branchUuid, branchName); + return IOseeBranch.create(branchUuid, branchName); } @Override diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java index 3989b2256e3..949709c5084 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java @@ -17,7 +17,6 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.dsl.integration.util.OseeDslSegmentParser; import org.eclipse.osee.framework.core.dsl.integration.util.OseeDslSegmentParser.OseeDslSegment; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -76,7 +75,7 @@ public class OseeDslArtifactUpdateOperation extends AbstractOperation { } protected void addChanges(Map<BranchId, SkynetTransaction> transactionMap, long branchId, String artifactGuid, String data) throws OseeCoreException { - BranchId branch = TokenFactory.createBranch(branchId); + BranchId branch = BranchId.valueOf(branchId); SkynetTransaction transaction = transactionMap.get(branch); if (transaction == null) { transaction = TransactionManager.createTransaction(branch, "OseeDslArtifactUpdate"); diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java index a55dcf98fe1..dd2046e36d4 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java @@ -76,7 +76,7 @@ public final class MockDataFactory { if (value == 0) { value++; } - IOseeBranch branch = TokenFactory.createBranch(branchUuid, "fake test branch"); + IOseeBranch branch = IOseeBranch.create(branchUuid, "fake test branch"); return new TransactionRecord(value * 47L, branch, "comment_" + value, new Date(), value * 37, value * 42, type); } diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TransactionRecordTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TransactionRecordTest.java index 3bd53ec2604..cffb62c6e9f 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TransactionRecordTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TransactionRecordTest.java @@ -14,7 +14,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TransactionId; import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.framework.core.model.TransactionRecord; @@ -153,7 +152,7 @@ public class TransactionRecordTest { Collection<Object[]> data = new ArrayList<>(); for (int index = 1; index <= 2; index++) { int transactionNumber = index * 11; - BranchId branch = TokenFactory.createBranch(index * 9L); + BranchId branch = BranchId.valueOf(index * 9L); String comment = GUID.create(); Date time = new Date(); int authorArtId = index * 47; diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java index 37349142646..eca5bb1dfc3 100644 --- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java +++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java @@ -28,8 +28,8 @@ public class DefaultBasicGuidArtifact extends BaseIdentity<String> implements IB } @Override - public Long getBranchId() { - return branch.getId(); + public BranchId getBranch() { + return branch; } @Override diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/HasBranch.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/HasBranch.java index 1ca5989fb2e..6c7d08d7d05 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/HasBranch.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/HasBranch.java @@ -16,7 +16,7 @@ package org.eclipse.osee.framework.core.data; public interface HasBranch { default BranchId getBranch() { - return TokenFactory.createBranch(getBranchId()); + return BranchId.valueOf(getBranchId()); } default Long getBranchId() { diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java index e9b25776a55..96057e99881 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IOseeBranch.java @@ -12,6 +12,7 @@ package org.eclipse.osee.framework.core.data; import org.eclipse.osee.framework.jdk.core.type.Named; import org.eclipse.osee.framework.jdk.core.type.NamedId; +import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; /** @@ -28,10 +29,18 @@ public interface IOseeBranch extends BranchId, Named { return Strings.truncate(getName(), length); } + public static IOseeBranch create(String name) { + return create(Lib.generateUuid(), name); + } + public static IOseeBranch create(BranchId id, String name) { return create(id.getId(), name); } + public static IOseeBranch create(long id, String name) { + return create(Long.valueOf(id), name); + } + public static IOseeBranch create(Long id, String name) { final class BranchTokenImpl extends NamedId implements IOseeBranch { 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 53e71ca9fb3..dadb58fbb1e 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 @@ -17,7 +17,6 @@ import org.eclipse.osee.framework.jdk.core.type.FullyNamedIdentity; import org.eclipse.osee.framework.jdk.core.type.NamedId; import org.eclipse.osee.framework.jdk.core.type.NamedIdentity; import org.eclipse.osee.framework.jdk.core.util.Conditions; -import org.eclipse.osee.framework.jdk.core.util.Lib; public final class TokenFactory { @@ -69,26 +68,6 @@ public final class TokenFactory { return new UserToken(uuid, guid, name, userId, active, admin, email, creationRequired); } - public static IOseeBranch createBranch(String name) { - return createBranch(Lib.generateUuid(), name); - } - - public static IOseeBranch createBranch(Long branchId, String name) { - return new BranchToken(branchId, name); - } - - public static IOseeBranch createBranch(long branchId, String name) { - return new BranchToken(branchId, name); - } - - public static BranchId createBranch(Long branchId) { - return new BranchToken(branchId, null); - } - - public static BranchId createBranch() { - return new BranchToken(Lib.generateUuid(), null); - } - private final static class ArtifactTypeToken extends NamedId implements IArtifactType { public ArtifactTypeToken(Long id, String name) { super(id, name); @@ -100,12 +79,6 @@ public final class TokenFactory { } } - private static final class BranchToken extends NamedId implements IOseeBranch { - public BranchToken(Long branchId, String name) { - super(branchId, name); - } - } - private final static class AttributeTypeToken extends FullyNamedIdentity<Long> implements IAttributeType { public AttributeTypeToken(Long guid, String name) { super(guid, name); diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreBranches.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreBranches.java index 619db9e3a06..4eaf9c30c22 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreBranches.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreBranches.java @@ -11,15 +11,14 @@ package org.eclipse.osee.framework.core.enums; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; /** * @author Roberto E. Escobar */ public final class CoreBranches { - public static final IOseeBranch COMMON = TokenFactory.createBranch(570, "Common"); - public static final IOseeBranch SYSTEM_ROOT = TokenFactory.createBranch(1, "System Root Branch"); + public static final IOseeBranch COMMON = IOseeBranch.create(570, "Common"); + public static final IOseeBranch SYSTEM_ROOT = IOseeBranch.create(1, "System Root Branch"); public static final Long SYSTEM_ROOT_ID = SYSTEM_ROOT.getUuid(); public CoreBranches() { diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/DemoBranches.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/DemoBranches.java index 3a916bf03d5..2c3d45f66f6 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/DemoBranches.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/DemoBranches.java @@ -11,20 +11,19 @@ package org.eclipse.osee.framework.core.enums; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; /** * @author Donald G. Dunne */ public final class DemoBranches { - public static final IOseeBranch SAW_Bld_1 = TokenFactory.createBranch(3, "SAW_Bld_1"); - public static final IOseeBranch SAW_Bld_2 = TokenFactory.createBranch(5, "SAW_Bld_2"); - public static final IOseeBranch SAW_Bld_3 = TokenFactory.createBranch("SAW_Bld_3"); + public static final IOseeBranch SAW_Bld_1 = IOseeBranch.create(3, "SAW_Bld_1"); + public static final IOseeBranch SAW_Bld_2 = IOseeBranch.create(5, "SAW_Bld_2"); + public static final IOseeBranch SAW_Bld_3 = IOseeBranch.create("SAW_Bld_3"); - public static final IOseeBranch CIS_Bld_1 = TokenFactory.createBranch(4, "CIS_Bld_1"); - public static final IOseeBranch CIS_Bld_2 = TokenFactory.createBranch("CIS_Bld_2"); - public static final IOseeBranch CIS_Bld_3 = TokenFactory.createBranch("CIS_Bld_3"); + public static final IOseeBranch CIS_Bld_1 = IOseeBranch.create(4, "CIS_Bld_1"); + public static final IOseeBranch CIS_Bld_2 = IOseeBranch.create("CIS_Bld_2"); + public static final IOseeBranch CIS_Bld_3 = IOseeBranch.create("CIS_Bld_3"); private DemoBranches() { // Constants diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java index bc87c9eaf10..8408b67129a 100644 --- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java +++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java @@ -15,7 +15,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.messaging.event.res.RemoteEvent; @@ -94,7 +93,7 @@ public class RemoteBasicGuidArtifact1 extends RemoteEvent { public BranchId getBranch() { if (branch == null && Strings.isNumeric(branchGuid)) { - branch = TokenFactory.createBranch(Long.valueOf(branchGuid)); + branch = BranchId.valueOf(branchGuid); } return branch; diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java index 2da9b1beaad..13d762bec38 100644 --- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java +++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java @@ -12,7 +12,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.messaging.event.res.RemoteEvent; @@ -76,7 +75,7 @@ public class RemoteBranchEvent1 extends RemoteEvent { } public BranchId getBranch() { - return TokenFactory.createBranch(Long.valueOf(branchGuid)); + return BranchId.valueOf(branchGuid); } public void setBranch(BranchId banch) { @@ -88,8 +87,7 @@ public class RemoteBranchEvent1 extends RemoteEvent { } public BranchId getDestinationBranch() { - return Strings.isNumeric(destinationBranchGuid) ? TokenFactory.createBranch( - Long.valueOf(destinationBranchGuid)) : null; + return Strings.isNumeric(destinationBranchGuid) ? BranchId.valueOf(destinationBranchGuid) : null; } public void setDestinationBranch(BranchId branch) { diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchUuidEventFilterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchUuidEventFilterTest.java index af1deecaf98..91566cf7e68 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchUuidEventFilterTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/filter/BranchUuidEventFilterTest.java @@ -15,7 +15,6 @@ import static org.eclipse.osee.framework.core.enums.CoreBranches.SYSTEM_ROOT; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.model.event.IBasicGuidArtifact; @@ -46,9 +45,9 @@ public class BranchUuidEventFilterTest { public void testIsMatchArtifacts() { BranchUuidEventFilter branchFilter = new BranchUuidEventFilter(COMMON); - EventBasicGuidArtifact guidArtA = new EventBasicGuidArtifact(EventModType.Added, TokenFactory.createBranch(), + EventBasicGuidArtifact guidArtA = new EventBasicGuidArtifact(EventModType.Added, BranchId.create(), CoreArtifactTypes.Requirement.getGuid(), GUID.create()); - EventBasicGuidArtifact guidArtB = new EventBasicGuidArtifact(EventModType.Added, TokenFactory.createBranch(), + EventBasicGuidArtifact guidArtB = new EventBasicGuidArtifact(EventModType.Added, BranchId.create(), CoreArtifactTypes.SoftwareRequirement.getGuid(), GUID.create()); List<IBasicGuidArtifact> arts = new ArrayList<>(); arts.add(guidArtB); @@ -69,9 +68,9 @@ public class BranchUuidEventFilterTest { public void testIsMatchRelationArtifacts() { BranchUuidEventFilter branchFilter = new BranchUuidEventFilter(COMMON); - EventBasicGuidArtifact guidArtA = new EventBasicGuidArtifact(EventModType.Added, TokenFactory.createBranch(), + EventBasicGuidArtifact guidArtA = new EventBasicGuidArtifact(EventModType.Added, BranchId.create(), CoreArtifactTypes.Requirement.getGuid(), GUID.create()); - EventBasicGuidArtifact guidArtB = new EventBasicGuidArtifact(EventModType.Added, TokenFactory.createBranch(), + EventBasicGuidArtifact guidArtB = new EventBasicGuidArtifact(EventModType.Added, BranchId.create(), CoreArtifactTypes.SoftwareRequirement.getGuid(), GUID.create()); List<IBasicGuidRelation> relations = new ArrayList<>(); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventHandlersTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventHandlersTest.java index 8338845d539..d200633ce64 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventHandlersTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventHandlersTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core.internal.event; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteBranchEvent1; import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteBroadcastEvent1; @@ -61,8 +61,7 @@ public class EventHandlersTest { Assert.assertEquals(local1, handlers.getLocalHandler(new TransactionEvent())); Assert.assertEquals(local2, handlers.getLocalHandler(new ArtifactEvent(CoreBranches.COMMON))); - Assert.assertNull( - handlers.getLocalHandler(new BranchEvent(BranchEventType.Added, TokenFactory.createBranch(345L)))); + Assert.assertNull(handlers.getLocalHandler(new BranchEvent(BranchEventType.Added, BranchId.valueOf(345L)))); Assert.assertEquals(remote1, handlers.getRemoteHandler(new RemoteTransactionEvent1())); Assert.assertEquals(remote2, handlers.getRemoteHandler(new RemoteBranchEvent1())); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventListenerRegistryTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventListenerRegistryTest.java index acd3f6a0207..f49d5fef089 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventListenerRegistryTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventListenerRegistryTest.java @@ -13,7 +13,6 @@ package org.eclipse.osee.framework.skynet.core.internal.event; import java.util.Collection; import java.util.List; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.skynet.core.event.filter.IEventFilter; import org.eclipse.osee.framework.skynet.core.event.listener.EventQosType; @@ -38,7 +37,7 @@ public class EventListenerRegistryTest { @Test public void testRegistration() { - BranchId branch = TokenFactory.createBranch(345L); + BranchId branch = BranchId.valueOf(345L); EventListenerRegistry registry = new EventListenerRegistry(); Delegate1 delegate1 = new Delegate1(); Delegate2 delegate2 = new Delegate2(); @@ -67,8 +66,8 @@ public class EventListenerRegistryTest { Assert.assertEquals(1, listener2.size()); Assert.assertEquals(delegate1, listener2.iterator().next()); - Collection<IEventListener> listener3 = registry.getListeners(EventQosType.NORMAL, - new BranchEvent(BranchEventType.Added, TokenFactory.createBranch(3L))); + Collection<IEventListener> listener3 = + registry.getListeners(EventQosType.NORMAL, new BranchEvent(BranchEventType.Added, BranchId.valueOf(3L))); Assert.assertEquals(1, listener3.size()); Assert.assertEquals(delegate2, listener3.iterator().next()); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java index e4e19baee1b..fd3ce8357cc 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java @@ -26,7 +26,6 @@ import org.eclipse.osee.framework.core.data.ApplicabilityId; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TransactionId; import org.eclipse.osee.framework.core.data.TransactionToken; import org.eclipse.osee.framework.core.enums.DeletionFlag; @@ -328,7 +327,7 @@ public final class ArtifactLoader { */ private static Artifact retrieveShallowArtifact(JdbcStatement chStmt, LoadType reload, boolean historical, boolean isArchived) throws OseeCoreException { ArtifactId artifactId = ArtifactId.valueOf(chStmt.getLong("art_id")); - BranchId branch = TokenFactory.createBranch(chStmt.getLong("branch_id")); + BranchId branch = BranchId.valueOf(chStmt.getLong("branch_id")); TransactionToken transactionId = TransactionToken.SENTINEL; ApplicabilityId appId = ApplicabilityId.valueOf(chStmt.getLong("app_id")); if (historical) { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java index 9a079f4476e..a8edb59a68e 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java @@ -439,7 +439,7 @@ public final class BranchManager { getBranchName(parentTransactionId), parentTransactionId.getId()); CreateBranchHttpRequestOperation operation = new CreateBranchHttpRequestOperation(BranchType.WORKING, - parentTransactionId, TokenFactory.createBranch(childBranchName), associatedArtifact, creationComment); + parentTransactionId, IOseeBranch.create(childBranchName), associatedArtifact, creationComment); operation.setTxCopyBranchType(true); Operations.executeWorkAndCheckStatus(operation); return operation.getNewBranch(); @@ -450,7 +450,7 @@ public final class BranchManager { getBranchName(parentTransactionId), parentTransactionId.getId()); CreateBranchHttpRequestOperation operation = new CreateBranchHttpRequestOperation(BranchType.PORT, - parentTransactionId, TokenFactory.createBranch(childBranchName), associatedArtifact, creationComment); + parentTransactionId, IOseeBranch.create(childBranchName), associatedArtifact, creationComment); operation.setTxCopyBranchType(true); Operations.executeWorkAndCheckStatus(operation); return operation.getNewBranch(); @@ -471,7 +471,7 @@ public final class BranchManager { } public static IOseeBranch createWorkingBranch(TransactionToken parentTransaction, String branchName, ArtifactId associatedArtifact) throws OseeCoreException { - return createBranch(BranchType.WORKING, parentTransaction, TokenFactory.createBranch(branchName), + return createBranch(BranchType.WORKING, parentTransaction, IOseeBranch.create(branchName), associatedArtifact); } @@ -489,7 +489,7 @@ public final class BranchManager { } public static BranchId createTopLevelBranch(final String branchName) throws OseeCoreException { - return createTopLevelBranch(TokenFactory.createBranch(branchName)); + return createTopLevelBranch(IOseeBranch.create(branchName)); } private static IOseeBranch createBranch(BranchType branchType, TransactionToken parentTransaction, IOseeBranch childBranch, ArtifactId associatedArtifact) { @@ -503,7 +503,7 @@ public final class BranchManager { private static IOseeBranch createBranch(BranchType branchType, TransactionToken parentTransaction, String branchName, Artifact associatedArtifact, String creationComment, int mergeAddressingQueryId, BranchId destinationBranch) { CreateBranchHttpRequestOperation operation = - new CreateBranchHttpRequestOperation(branchType, parentTransaction, TokenFactory.createBranch(branchName), + new CreateBranchHttpRequestOperation(branchType, parentTransaction, IOseeBranch.create(branchName), associatedArtifact, creationComment, mergeAddressingQueryId, destinationBranch); Operations.executeWorkAndCheckStatus(operation); return operation.getNewBranch(); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java index 61ed0e555e7..fd4e3d14a5c 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeArtifactType.java @@ -22,11 +22,10 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugPlugin; +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.TokenFactory; import org.eclipse.osee.framework.core.enums.BranchArchivedState; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.DeletionFlag; @@ -138,8 +137,7 @@ public class ChangeArtifactType { while (chStmt.next()) { int gammaId = chStmt.getInt("gamma_id"); - long branchUuid = chStmt.getLong("branch_id"); - BranchId branch = TokenFactory.createBranch(branchUuid); + BranchId branch = BranchId.valueOf(chStmt.getLong("branch_id")); int artId = gammaToArtId.get(gammaId); Artifact artifact = ArtifactQuery.checkArtifactFromId(artId, branch, DeletionFlag.EXCLUDE_DELETED); if (artifact != null) { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java index a4d37c6d555..71e2c99f4ed 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java @@ -18,7 +18,6 @@ import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; @@ -174,7 +173,7 @@ public class PurgeArtifacts extends AbstractDbTxOperation { int artId = chStmt.getInt("art_id"); long branchUuid = chStmt.getLong("branch_id"); if (recurseChildrenBranches) { - BranchId branch = TokenFactory.createBranch(branchUuid); + BranchId branch = BranchId.valueOf(branchUuid); Artifact artifactFromId = ArtifactQuery.getArtifactFromId(artId, branch); artifactsToPurge.add(artifactFromId); } else { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RelationLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RelationLoader.java index 82f013510ac..307bafe2298 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RelationLoader.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RelationLoader.java @@ -15,7 +15,6 @@ import static org.eclipse.osee.framework.core.enums.LoadLevel.ARTIFACT_DATA; import java.util.Collection; import org.eclipse.osee.framework.core.data.ApplicabilityId; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.LoadLevel; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.model.type.RelationType; @@ -49,7 +48,7 @@ class RelationLoader { int relationId = chStmt.getInt("rel_link_id"); int aArtifactId = chStmt.getInt("a_art_id"); int bArtifactId = chStmt.getInt("b_art_id"); - BranchId branch = TokenFactory.createBranch(chStmt.getLong("branch_id")); + BranchId branch = BranchId.valueOf(chStmt.getLong("branch_id")); RelationType relationType = RelationTypeManager.getTypeByGuid(chStmt.getLong("rel_link_type_id")); int gammaId = chStmt.getInt("gamma_id"); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java index 446df0f3824..0a8207bc5d5 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java @@ -92,11 +92,11 @@ public class ArtifactQuery { } public static Artifact getArtifactFromToken(EventBasicGuidArtifact guidArt) throws OseeCoreException { - return getArtifactFromId(guidArt.getGuid(), TokenFactory.createBranch(guidArt.getBranchId())); + return getArtifactFromId(guidArt.getGuid(), guidArt.getBranch()); } public static Artifact getArtifactFromToken(IBasicGuidArtifact guidArt) throws OseeCoreException { - return getArtifactFromId(guidArt.getGuid(), TokenFactory.createBranch(guidArt.getBranchId())); + return getArtifactFromId(guidArt.getGuid(), guidArt.getBranch()); } /** diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/service/BranchAttributeAdapter.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/service/BranchAttributeAdapter.java index a44f518d6f0..f96d58141dc 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/service/BranchAttributeAdapter.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/service/BranchAttributeAdapter.java @@ -14,7 +14,6 @@ import java.util.Collection; import java.util.Collections; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.jdk.core.type.Id; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -25,7 +24,7 @@ public class BranchAttributeAdapter implements AttributeAdapter<BranchId> { @Override public BranchId adapt(Attribute<?> attribute, Id identity) throws OseeCoreException { - return TokenFactory.createBranch(identity.getId()); + return BranchId.valueOf(identity.getId()); } @Override diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflict.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflict.java index 318ad445167..68eff4a453d 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflict.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/AttributeConflict.java @@ -19,7 +19,6 @@ import java.util.logging.Level; import org.eclipse.core.runtime.Platform; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TransactionToken; import org.eclipse.osee.framework.core.enums.ConflictStatus; import org.eclipse.osee.framework.core.enums.ConflictType; @@ -435,10 +434,8 @@ public class AttributeConflict extends Conflict { Artifact mergeArtifact; Artifact destArtifact; try { - mergeArtifact = - ArtifactQuery.getArtifactFromId(getArtifact().getArtId(), TokenFactory.createBranch(mergeBranchId)); - destArtifact = - ArtifactQuery.getArtifactFromId(getArtifact().getArtId(), TokenFactory.createBranch(destBranchId)); + mergeArtifact = ArtifactQuery.getArtifactFromId(getArtifact(), BranchId.valueOf(mergeBranchId)); + destArtifact = ArtifactQuery.getArtifactFromId(getArtifact(), BranchId.valueOf(destBranchId)); } catch (ArtifactDoesNotExist ex) { return false; } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java index 79e729adc88..5d0d4790ceb 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.logging.Level; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidArtifact; import org.eclipse.osee.framework.core.model.event.DefaultBasicUuidRelationReorder; import org.eclipse.osee.framework.core.model.event.RelationOrderModType; @@ -178,10 +178,9 @@ public final class FrameworkEventUtil { } public static DefaultBasicUuidRelationReorder getDefaultBasicGuidRelationReorder(RemoteBasicGuidRelationReorder1 guidRelOrder) { - DefaultBasicUuidRelationReorder guidArt = - new DefaultBasicUuidRelationReorder(RelationOrderModType.getType(guidRelOrder.getModTypeGuid()), - TokenFactory.createBranch(getBranchUuidFromRemoteEvent(guidRelOrder.getBranchGuid())), - guidRelOrder.getRelTypeGuid(), getBasicGuidArtifact(guidRelOrder.getParentArt())); + DefaultBasicUuidRelationReorder guidArt = new DefaultBasicUuidRelationReorder( + RelationOrderModType.getType(guidRelOrder.getModTypeGuid()), BranchId.valueOf(guidRelOrder.getBranchGuid()), + guidRelOrder.getRelTypeGuid(), getBasicGuidArtifact(guidRelOrder.getParentArt())); return guidArt; } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/DslToTypeLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/DslToTypeLoader.java index bb9ef8e1887..92f6f4733c6 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/DslToTypeLoader.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/DslToTypeLoader.java @@ -23,7 +23,6 @@ import java.util.Set; import java.util.logging.Level; import org.eclipse.emf.common.util.EList; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.dsl.OseeDslResource; import org.eclipse.osee.framework.core.dsl.OseeDslResourceUtil; import org.eclipse.osee.framework.core.dsl.oseeDsl.AddAttribute; @@ -189,7 +188,7 @@ public class DslToTypeLoader implements TypesLoader { if (branchIdStr == null) { return CoreBranches.SYSTEM_ROOT; } else { - return TokenFactory.createBranch(Long.valueOf(branchIdStr)); + return BranchId.valueOf(branchIdStr); } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactRemoteEventHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactRemoteEventHandler.java index 611660bff05..82db36f2c60 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactRemoteEventHandler.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactRemoteEventHandler.java @@ -13,7 +13,6 @@ package org.eclipse.osee.framework.skynet.core.internal.event.handlers; import java.util.Collection; import org.eclipse.osee.framework.core.data.ApplicabilityId; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TransactionToken; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidArtifact; @@ -186,7 +185,7 @@ public class ArtifactRemoteEventHandler implements EventHandlerRemote<RemotePers boolean bArtifactLoaded = bArtifact != null; if (aArtifactLoaded || bArtifactLoaded) { - BranchId branch = TokenFactory.createBranch(guidArt.getArtA().getBranchId()); + BranchId branch = guidArt.getArtA().getBranch(); RelationLink relation = RelationManager.getLoadedRelationById(guidArt.getRelationId(), guidArt.getArtAId(), guidArt.getArtBId(), branch); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java index 67fd95bab78..9d4d39ee93b 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeManager.java @@ -14,7 +14,6 @@ import java.util.ArrayList; import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TransactionId; import org.eclipse.osee.framework.core.data.TransactionToken; import org.eclipse.osee.framework.core.enums.BranchArchivedState; @@ -129,7 +128,7 @@ public final class ChangeManager { chStmt.runPreparedQuery(joinQuery.size() * 2, ServiceUtil.getSql(OseeSql.CHANGE_TX_MODIFYING), joinQuery.getQueryId()); while (chStmt.next()) { - BranchId branch = TokenFactory.createBranch(chStmt.getLong("branch_id")); + BranchId branch = BranchId.valueOf(chStmt.getLong("branch_id")); Artifact artifact = artifactMap.get(chStmt.getInt("art_id"), branch); transactionMap.put(artifact, TransactionId.valueOf(chStmt.getLong("transaction_id"))); } @@ -172,7 +171,7 @@ public final class ChangeManager { joinQuery.getQueryId()); while (chStmt.next()) { if (chStmt.getInt("tx_count") > 0) { - BranchId branch = TokenFactory.createBranch(chStmt.getLong("branch_id")); + BranchId branch = BranchId.valueOf(chStmt.getLong("branch_id")); Artifact artifact = artifactMap.get(chStmt.getInt("art_id"), BranchManager.getParentBranch(branch)); branchMap.put(artifact, branch); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java index 3e49c6dea8e..c19f6998748 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java @@ -23,7 +23,6 @@ import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IRelationType; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TransactionId; import org.eclipse.osee.framework.core.data.TransactionToken; import org.eclipse.osee.framework.core.enums.DeletionFlag; @@ -176,7 +175,7 @@ public final class TransactionManager { } private static TransactionRecord loadTransaction(JdbcStatement stmt) { - return loadTransaction(TokenFactory.createBranch(stmt.getLong("branch_id")), stmt); + return loadTransaction(BranchId.valueOf(stmt.getLong("branch_id")), stmt); } private static TransactionRecord loadTransaction(BranchId branch, JdbcStatement stmt) { diff --git a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphLoader.java b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphLoader.java index 067c1120d9b..00c400914d7 100644 --- a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphLoader.java +++ b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/model/GraphLoader.java @@ -14,7 +14,6 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; @@ -147,7 +146,7 @@ public class GraphLoader { try { chStmt.runPreparedQuery(GET_TRANSACTION_DATA, queryId); while (chStmt.next()) { - BranchId branch = TokenFactory.createBranch(chStmt.getLong("branch_id")); + BranchId branch = BranchId.valueOf(chStmt.getLong("branch_id")); TxData txData = new TxData(branch, chStmt.getInt("author"), chStmt.getTimestamp("time"), chStmt.getString("osee_comment"), chStmt.getInt("tx_type"), chStmt.getInt("commit_art_id"), chStmt.getLong("transaction_id")); diff --git a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/ArtifactURIHandler.java b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/ArtifactURIHandler.java index c7f0d60d494..93f692811c5 100644 --- a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/ArtifactURIHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/ArtifactURIHandler.java @@ -24,12 +24,10 @@ import org.eclipse.emf.ecore.resource.URIConverter; import org.eclipse.emf.ecore.resource.impl.URIHandlerImpl; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.io.StringOutputStream; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; /** @@ -64,7 +62,7 @@ public class ArtifactURIHandler extends URIHandlerImpl { private <T> T createStream(URI uri, BiFunction<Artifact, Long, T> function) { String[] segments = uri.segments(); - BranchId branch = TokenFactory.createBranch(Long.parseLong(segments[0])); + BranchId branch = BranchId.valueOf(segments[0]); Artifact artifact = ArtifactQuery.getArtifactFromId(Long.parseLong(segments[2]), branch); Long attributeId = Long.parseLong(segments[4]); return function.apply(artifact, attributeId); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java index ce08f299a42..bc4f31a7281 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java @@ -20,9 +20,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.operation.IRunnableWithProgress; +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.TokenFactory; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.operation.OperationLogger; @@ -383,7 +383,7 @@ public class ArtifactImportPage extends WizardDataTransferPage { if (GUID.isValid(guid) && Strings.isNumeric(branchUuidStr)) { try { Long bramchUuid = Long.valueOf(branchUuidStr); - Artifact artifact = ArtifactQuery.getArtifactFromId(guid, TokenFactory.createBranch(bramchUuid)); + Artifact artifact = ArtifactQuery.getArtifactFromId(guid, BranchId.valueOf(bramchUuid)); artifactSelectPanel.setDefaultItem(artifact); } catch (OseeCoreException ex) { OseeLog.logf(Activator.class, Level.SEVERE, diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java index 77334344e69..d05cd301608 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java @@ -16,12 +16,11 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.logging.Level; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData; -import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.dnd.ByteArrayTransfer; @@ -45,7 +44,7 @@ import org.eclipse.swt.dnd.TransferData; * A singleton is provided which may be serially reused (see <code>getInstance</code>). It is not intended to be * subclassed. * </p> - * + * * @see org.eclipse.jface.viewers.StructuredViewer * @see org.eclipse.swt.dnd.DropTarget * @see org.eclipse.swt.dnd.DragSource @@ -158,12 +157,12 @@ public class ArtifactTransfer extends ByteArrayTransfer { private Artifact readArtifact(DataInputStream dataIn) throws OseeCoreException, IOException { int artID = dataIn.readInt(); long branchUuid = dataIn.readLong(); - return ArtifactQuery.getArtifactFromId(artID, TokenFactory.createBranch(branchUuid)); + return ArtifactQuery.getArtifactFromId(artID, BranchId.valueOf(branchUuid)); } /** * Writes the given resource to the given stream. - * + * * @throws OseeCoreException */ private void writeArtifact(DataOutputStream dataOut, Artifact artifact) throws IOException, OseeCoreException { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorInput.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorInput.java index 4822a280ceb..23790a4349c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorInput.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorInput.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.ui.skynet.artifact.editor; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; @@ -122,8 +122,7 @@ public class ArtifactEditorInput implements IEditorInput, IPersistableElement { if (artifact == null && !attemptedReload) { if (savedArtUuid != null && savedBranchUuid != null) { try { - artifact = - ArtifactQuery.getArtifactFromId(savedArtUuid.intValue(), TokenFactory.createBranch(savedBranchUuid)); + artifact = ArtifactQuery.getArtifactFromId(savedArtUuid, BranchId.valueOf(savedBranchUuid)); } catch (Exception ex) { // do nothing } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorReloadTab.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorReloadTab.java index da987769981..9d8f6513e06 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorReloadTab.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorReloadTab.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.IJobChangeEvent; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.JobChangeAdapter; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -169,7 +169,7 @@ public class ArtifactEditorReloadTab extends FormPage { protected IStatus run(IProgressMonitor monitor) { if (artUuid > 0) { try { - artifact = ArtifactQuery.getArtifactFromId(artUuid, TokenFactory.createBranch(branchUuid)); + artifact = ArtifactQuery.getArtifactFromId(artUuid, BranchId.valueOf(branchUuid)); } catch (ArtifactDoesNotExist ex) { // do nothing } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInputFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInputFactory.java index 93ce193610e..ad620f69151 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInputFactory.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInputFactory.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.change; import java.util.logging.Level; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.TransactionToken; import org.eclipse.osee.framework.core.model.TransactionDelta; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -52,7 +52,7 @@ public class ChangeReportEditorInputFactory implements IElementFactory { String branchUuid = memento.getString(BRANCH_ID_KEY); if (Strings.isNumeric(branchUuid)) { try { - toReturn.setBranch(TokenFactory.createBranch(Long.valueOf(branchUuid))); + toReturn.setBranch(BranchId.valueOf(branchUuid)); } catch (Exception ex) { // do nothing } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java index 7b4c50f6c92..b6d2622f15c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java @@ -23,7 +23,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.access.AccessControlManager; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -97,8 +96,7 @@ public abstract class CommitHandler extends CommandHandler { if (useParentBranch) { destinationBranch = BranchManager.getParentBranch(sourceBranch); } else { - destinationBranch = TokenFactory.createBranch( - Long.parseLong(event.getParameter(BranchOptionsEnum.BRANCH_ID.origKeyName))); + destinationBranch = BranchId.valueOf(event.getParameter(BranchOptionsEnum.BRANCH_ID.origKeyName)); } Jobs.startJob(new CommitJob(sourceBranch, destinationBranch, Boolean.parseBoolean(event.getParameter(CommitBranchParameter.ARCHIVE_PARENT_BRANCH)))); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java index dbd58cda656..683b76fe7f9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java @@ -16,7 +16,6 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -42,7 +41,7 @@ public class MergeManagerHandler extends CommandHandler { if (!branches.isEmpty()) { BranchId selectedBranch = branches.iterator().next(); - BranchId toBranch = TokenFactory.createBranch(Long.parseLong(event.getParameter(BranchView.BRANCH_ID))); + BranchId toBranch = BranchId.valueOf(event.getParameter(BranchView.BRANCH_ID)); if (selectedBranch != null && toBranch != null) { MergeView.openView(selectedBranch, toBranch, BranchManager.getBaseTransaction(selectedBranch)); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java index 833ddc4ba53..ba974fff7a6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java @@ -31,7 +31,6 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.osee.framework.access.AccessControlManager; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.help.ui.OseeHelpContext; @@ -338,7 +337,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor if (DbConnectionExceptionComposite.dbConnectionIsOk()) { try { if (memento != null && memento.getString(ROOT_UUID) != null && memento.getString(ROOT_BRANCH) != null) { - BranchId branch = TokenFactory.createBranch(Long.parseLong(memento.getString(ROOT_BRANCH))); + BranchId branch = BranchId.valueOf(memento.getString(ROOT_BRANCH)); if (!BranchManager.isArchived(branch) || AccessControlManager.isOseeAdmin()) { Artifact previousArtifact = diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java index 04db218476e..21d1dd14754 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java @@ -14,7 +14,7 @@ package org.eclipse.osee.framework.ui.skynet.results.html; import java.net.URL; import java.util.logging.Level; import java.util.regex.Pattern; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.PresentationType; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; @@ -66,7 +66,7 @@ public class XResultBrowserListener implements LocationListener { if (m.find()) { String guid = m.group(1); Long branchUuid = Long.parseLong(m.group(2)); - Artifact artifact = ArtifactQuery.getArtifactFromId(guid, TokenFactory.createBranch(branchUuid)); + Artifact artifact = ArtifactQuery.getArtifactFromId(guid, BranchId.valueOf(branchUuid)); RendererManager.openInJob(artifact, PresentationType.DEFAULT_OPEN); } } catch (Exception ex) { @@ -80,7 +80,7 @@ public class XResultBrowserListener implements LocationListener { break; case openBranch: event.doit = false; - BranchView.revealBranch(TokenFactory.createBranch(Long.valueOf(value))); + BranchView.revealBranch(BranchId.valueOf(value)); break; case browserInternal: event.doit = false; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java index 8607ff70223..5c442150585 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java @@ -23,7 +23,6 @@ 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.RelationTypeSide; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -160,7 +159,7 @@ public final class SkyWalkerOptions { String guid = AXml.getTagData(xml, "guid"); if (Strings.isValid(guid)) { String branchUuid = AXml.getTagData(xml, "branchUuid"); - BranchId branch = TokenFactory.createBranch(Long.parseLong(branchUuid)); + BranchId branch = BranchId.valueOf(branchUuid); Artifact art = ArtifactQuery.getArtifactFromId(guid, branch); if (art != null) { setArtifact(art); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java index fbc5b005b02..79275705cff 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java @@ -24,7 +24,7 @@ import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.SystemUser; import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -34,7 +34,6 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; @@ -156,8 +155,7 @@ public class SkyWalkerView extends GenericViewPart { // Restore current artifact if stored upon shutdown try { if (storedGuid != null) { - Artifact art = - ArtifactQuery.getArtifactFromId(storedGuid, TokenFactory.createBranch(Long.parseLong(storedBrandId))); + Artifact art = ArtifactQuery.getArtifactFromId(storedGuid, BranchId.valueOf(storedBrandId)); if (art != null) { explore(art); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java index cc71b65c3c8..962baf9a854 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java @@ -13,7 +13,6 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -33,7 +32,7 @@ public abstract class XTypeListViewer extends XListViewer { public BranchId resolveBranch(long branchUuid) { try { - return TokenFactory.createBranch(branchUuid); + return BranchId.valueOf(branchUuid); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java index c30ef05e1b0..39f063bc3a7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java @@ -29,7 +29,7 @@ import org.eclipse.jface.action.Separator; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.nebula.widgets.xviewer.customize.XViewerCustomMenu; import org.eclipse.osee.framework.access.AccessControlManager; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.TransactionId; import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.framework.help.ui.OseeHelpContext; @@ -342,7 +342,7 @@ public class HistoryView extends GenericViewPart implements IBranchEventListener String branchUuidStr = memento.getString(BRANCH_ID); if (Strings.isValid(branchUuidStr)) { Long branchUuid = Long.valueOf(branchUuidStr); - Artifact artifact = ArtifactQuery.getArtifactFromId(guid, TokenFactory.createBranch(branchUuid)); + Artifact artifact = ArtifactQuery.getArtifactFromId(guid, BranchId.valueOf(branchUuid)); openViewUpon(artifact, false); } } else { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java index 03c95828e9c..46598119589 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java @@ -21,7 +21,6 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TransactionToken; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.help.ui.OseeHelpContext; @@ -200,7 +199,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, return; } sourceBranchId = Long.parseLong(memento.getString(SOURCE_BRANCH_ID)); - final BranchId sourceBranch = TokenFactory.createBranch(sourceBranchId); + final BranchId sourceBranch = BranchId.valueOf(sourceBranchId); if (sourceBranch == null) { OseeLog.log(Activator.class, Level.WARNING, "Merge View can't init due to invalid source branch uuid " + sourceBranchId); @@ -208,7 +207,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, return; } destBranchId = Long.parseLong(memento.getString(DEST_BRANCH_ID)); - final BranchId destBranch = TokenFactory.createBranch(destBranchId); + final BranchId destBranch = BranchId.valueOf(destBranchId); if (destBranch == null) { OseeLog.log(Activator.class, Level.WARNING, "Merge View can't init due to invalid destination branch uuid " + sourceBranchId); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java index 3e53897e527..e45945582e9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java @@ -28,7 +28,6 @@ import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TransactionToken; import org.eclipse.osee.framework.core.enums.ConflictStatus; import org.eclipse.osee.framework.core.enums.PresentationType; @@ -207,7 +206,7 @@ public class MergeXWidget extends GenericXWidget implements IOseeTreeReportProvi monitor.beginTask("ApplyingPreviousMerge", conflicts.length); for (Conflict conflict : conflicts) { try { - BranchId destinationBranch = TokenFactory.createBranch(destBranchId); + BranchId destinationBranch = BranchId.valueOf(destBranchId); IOseeBranch mergeBranch = BranchManager.getMergeBranch(conflict.getSourceBranch(), destinationBranch); conflict.applyPreviousMerge(mergeBranch.getUuid(), destBranchId); } catch (OseeCoreException ex) { diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactoryTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactoryTest.java index 3cbe8e61474..f0149c88271 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactoryTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/BranchDataFactoryTest.java @@ -80,7 +80,7 @@ public class BranchDataFactoryTest { @Test public void testDataForTopLevelBranch() throws OseeCoreException { - IOseeBranch branch = TokenFactory.createBranch("testDataForTopLevelBranch"); + IOseeBranch branch = IOseeBranch.create("testDataForTopLevelBranch"); CreateBranchData result = factory.createTopLevelBranchData(branch, author); verify(txQuery).andIsHead(CoreBranches.SYSTEM_ROOT); @@ -92,7 +92,7 @@ public class BranchDataFactoryTest { @Test public void testDataForBaselineBranch() throws OseeCoreException { - IOseeBranch branch = TokenFactory.createBranch("testDataForBaselineBranch"); + IOseeBranch branch = IOseeBranch.create("testDataForBaselineBranch"); CreateBranchData result = factory.createBaselineBranchData(branch, author, parentBranch, associatedArtifact); verify(txQuery).andIsHead(parentBranch); @@ -104,7 +104,7 @@ public class BranchDataFactoryTest { @Test public void testDataForWorkingBranch() throws OseeCoreException { - IOseeBranch branch = TokenFactory.createBranch("testDataForWorkingBranch"); + IOseeBranch branch = IOseeBranch.create("testDataForWorkingBranch"); CreateBranchData result = factory.createWorkingBranchData(branch, author, parentBranch, associatedArtifact); verify(txQuery).andIsHead(parentBranch); @@ -116,7 +116,7 @@ public class BranchDataFactoryTest { @Test public void testDataForCopyTxBranch() throws OseeCoreException { - IOseeBranch branch = TokenFactory.createBranch("testDataForCopyTxBranch"); + IOseeBranch branch = IOseeBranch.create("testDataForCopyTxBranch"); CreateBranchData result = factory.createCopyTxBranchData(branch, author, txRecord, ArtifactId.SENTINEL); @@ -131,7 +131,7 @@ public class BranchDataFactoryTest { @Test public void testDataForPortBranch() throws OseeCoreException { - IOseeBranch branch = TokenFactory.createBranch("testDataForPortBranch"); + IOseeBranch branch = IOseeBranch.create("testDataForPortBranch"); CreateBranchData result = factory.createPortBranchData(branch, author, txRecord, ArtifactId.SENTINEL); 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 009c380a793..01a6a930110 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 @@ -39,6 +39,7 @@ 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.IOseeBranch; import org.eclipse.osee.framework.core.data.RelationTypeToken; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreBranches; @@ -95,11 +96,11 @@ public class OrcsTypesTest { static long BRANCH_A_UUID = 3458234234L; static long BRANCH_B_UUID = 9993245332L; - private static final BranchId BRANCH_A = TokenFactory.createBranch(BRANCH_A_UUID, "Branch A"); - private static final BranchId BRANCH_B = TokenFactory.createBranch(BRANCH_B_UUID, "Branch B"); - private static final BranchId BRANCH_C = TokenFactory.createBranch("Branch C"); - private static final BranchId BRANCH_D = TokenFactory.createBranch("Branch D"); - private static final BranchId BRANCH_E = TokenFactory.createBranch("Branch E"); + private static final BranchId BRANCH_A = IOseeBranch.create(BRANCH_A_UUID, "Branch A"); + private static final BranchId BRANCH_B = IOseeBranch.create(BRANCH_B_UUID, "Branch B"); + private static final BranchId BRANCH_C = IOseeBranch.create("Branch C"); + private static final BranchId BRANCH_D = IOseeBranch.create("Branch D"); + private static final BranchId BRANCH_E = IOseeBranch.create("Branch E"); @Mock private Log logger; @Mock private OrcsTypesDataStore dataStore; 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 59c0877c857..4a8c79191d8 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 @@ -28,7 +28,6 @@ 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; import org.eclipse.osee.framework.core.enums.QueryOption; @@ -440,7 +439,7 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter { @Override public Void caseOsTxHeadOfBranchIdCriteria(OsTxHeadOfBranchIdCriteria object) { Long id = resolver.resolveSingle(Long.class, object.getId()); - getTxQuery().andIsHead(TokenFactory.createBranch(id)); + getTxQuery().andIsHead(BranchId.valueOf(id)); return null; } @@ -705,7 +704,7 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter { ////////////////////////////// Functions; private BranchId asBranch(Long typeId) { - return TokenFactory.createBranch(typeId); + return BranchId.valueOf(typeId); } private Timestamp asTimestamp(Date date) { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java index b8beb94b259..a603370e9f4 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java @@ -91,7 +91,7 @@ public class BranchCallableQueryFactory { @Override public IOseeBranch createBranch(BranchData data) { - return TokenFactory.createBranch(data.getUuid(), data.getName()); + return IOseeBranch.create(data.getUuid(), data.getName()); } }; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImpl.java index 92a581e6c2f..f17ee1552dd 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImpl.java @@ -21,7 +21,6 @@ import java.util.concurrent.Callable; import org.eclipse.osee.executor.admin.CancellableCallable; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TransactionId; import org.eclipse.osee.framework.core.data.TransactionToken; import org.eclipse.osee.framework.core.enums.CoreBranches; @@ -75,7 +74,7 @@ public class TransactionFactoryImpl implements TransactionFactory { @Override public TransactionBuilder createTransaction(Long branchId, ArtifactId userArtifact, String comment) throws OseeCoreException { - BranchId branch = TokenFactory.createBranch(branchId); + BranchId branch = BranchId.valueOf(branchId); return createTransaction(branch, userArtifact, comment); } 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 7f5cddad9fc..f768d23f0cc 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 @@ -235,7 +235,7 @@ public class OrcsTypesIndexer { if (Strings.isValid(xAttributeTypeRef.getBranchUuid())) { Long branchId = Long.valueOf(xAttributeTypeRef.getBranchUuid()); if (branchId > 0) { - branchToken = TokenFactory.createBranch(branchId); + branchToken = BranchId.valueOf(branchId); } } return branchToken; diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/BranchLoadProcessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/BranchLoadProcessor.java index 95b2767ee11..a742f56efdc 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/BranchLoadProcessor.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/BranchLoadProcessor.java @@ -12,7 +12,6 @@ package org.eclipse.osee.orcs.db.internal.loader.processor; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TransactionId; import org.eclipse.osee.framework.core.enums.BranchArchivedState; import org.eclipse.osee.framework.core.enums.BranchState; @@ -41,7 +40,7 @@ public class BranchLoadProcessor extends LoadProcessor<BranchData, BranchObjectF BranchType branchType = BranchType.valueOf(chStmt.getInt("branch_type")); BranchArchivedState archiveState = BranchArchivedState.valueOf(chStmt.getInt("archived")); - BranchId parentBranchId = TokenFactory.createBranch(chStmt.getLong("parent_branch_id")); + BranchId parentBranchId = BranchId.valueOf(chStmt.getLong("parent_branch_id")); TransactionId sourceTx = TransactionId.valueOf(chStmt.getLong("parent_transaction_id")); TransactionId baseTx = TransactionId.valueOf(chStmt.getLong("baseline_transaction_id")); ArtifactId assocArtId = ArtifactId.valueOf(chStmt.getLong("associated_art_id")); diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchEndpointImpl.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchEndpointImpl.java index 908fcd2f83a..77a466fd414 100644 --- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchEndpointImpl.java +++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/BranchEndpointImpl.java @@ -39,7 +39,6 @@ import org.eclipse.osee.activity.api.ActivityLog; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TransactionId; import org.eclipse.osee.framework.core.data.TransactionToken; import org.eclipse.osee.framework.core.enums.BranchArchivedState; @@ -834,13 +833,13 @@ public class BranchEndpointImpl implements BranchEndpoint { Long ancestorOf = options.getIsAncestorOf(); if (ancestorOf > 0) { - BranchId ancestorOfToken = TokenFactory.createBranch(ancestorOf); + BranchId ancestorOfToken = BranchId.valueOf(ancestorOf); query.andIsAncestorOf(ancestorOfToken); } Long childOf = options.getIsChildOf(); if (childOf > 0) { - BranchId childOfToken = TokenFactory.createBranch(ancestorOf); + BranchId childOfToken = BranchId.valueOf(ancestorOf); query.andIsAncestorOf(childOfToken); } return query.getResults(); diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java index 5f79397101f..2b1b46e22ed 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchQueryTest.java @@ -230,7 +230,7 @@ public class OrcsBranchQueryTest { @Test public void zTestGetIncludeArchived() throws Exception { - IOseeBranch child = TokenFactory.createBranch(testName.getMethodName()); + IOseeBranch child = IOseeBranch.create(testName.getMethodName()); BranchQuery query = factory.branchQuery(); query.andIds(CIS_Bld_1); @@ -254,7 +254,7 @@ public class OrcsBranchQueryTest { @Test public void zTestGetIncludeDeleted() throws Exception { - IOseeBranch child = TokenFactory.createBranch(testName.getMethodName()); + IOseeBranch child = IOseeBranch.create(testName.getMethodName()); BranchQuery query = factory.branchQuery(); query.andIds(CIS_Bld_1); @@ -281,7 +281,7 @@ public class OrcsBranchQueryTest { @Test public void zTestGetWithMultipleConditions1() throws Exception { - IOseeBranch child = TokenFactory.createBranch(testName.getMethodName()); + IOseeBranch child = IOseeBranch.create(testName.getMethodName()); BranchId actual = createBranch(SAW_Bld_2, child); diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java index badccd4f251..be2fa43c123 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java @@ -79,7 +79,7 @@ public class OrcsBranchTest { int CHANGED_TX_ID = 9; // Transaction containing tested change // set up the initial branch - IOseeBranch branch = TokenFactory.createBranch("PriorBranch"); + IOseeBranch branch = IOseeBranch.create("PriorBranch"); ArtifactId author = SystemUser.OseeSystem; @@ -105,7 +105,7 @@ public class OrcsBranchTest { // user Joe Smith, so if the code is correct, and the copy includes the final // transaction, then this will produce the same result as the query of the common branch // create the branch with the copied transaction - IOseeBranch postbranch = TokenFactory.createBranch("PostBranch"); + IOseeBranch postbranch = IOseeBranch.create("PostBranch"); TransactionId tx1 = TransactionId.valueOf(CHANGED_TX_ID); Callable<BranchReadable> postCallable = @@ -132,7 +132,7 @@ public class OrcsBranchTest { List<ChangeItem> priorItems = callable.call(); // create the branch with the copied transaction - IOseeBranch branch = TokenFactory.createBranch("CopiedBranch"); + IOseeBranch branch = IOseeBranch.create("CopiedBranch"); ArtifactId author = SystemUser.OseeSystem; @@ -151,7 +151,7 @@ public class OrcsBranchTest { public void testCommitBranchMissingArtifactsOnDestination() throws Exception { ArtifactId author = SystemUser.OseeSystem; // set up the initial branch - IOseeBranch branch = TokenFactory.createBranch("BaseBranch"); + IOseeBranch branch = IOseeBranch.create("BaseBranch"); Callable<BranchReadable> callableBranch = branchOps.createTopLevelBranch(branch, author); BranchReadable base = callableBranch.call(); @@ -162,7 +162,7 @@ public class OrcsBranchTest { // create working branch off of base to make some changes // set up the child branch - IOseeBranch branchName = TokenFactory.createBranch("ChildBranch"); + IOseeBranch branchName = IOseeBranch.create("ChildBranch"); Callable<BranchReadable> callableChildBranch = branchOps.createWorkingBranch(branchName, author, base, ArtifactId.SENTINEL); @@ -182,7 +182,7 @@ public class OrcsBranchTest { // create a disjoint working branch from common - IOseeBranch commonName = TokenFactory.createBranch("ChildFromCommonBranch"); + IOseeBranch commonName = IOseeBranch.create("ChildFromCommonBranch"); Callable<BranchReadable> callableBranchFromCommon = branchOps.createWorkingBranch(commonName, author, CoreBranches.COMMON, ArtifactId.SENTINEL); BranchReadable commonChildBranch = callableBranchFromCommon.call(); @@ -197,7 +197,7 @@ public class OrcsBranchTest { public void testBranchUpdateFields() throws Exception { String branchName = testName.getMethodName(); - IOseeBranch branch = TokenFactory.createBranch(branchName); + IOseeBranch branch = IOseeBranch.create(branchName); branchOps.createBaselineBranch(branch, SystemUser.OseeSystem, CoreBranches.SYSTEM_ROOT, SENTINEL).call(); diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsPortingTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsPortingTest.java index d2778b416ce..0ce0cd7c9df 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsPortingTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsPortingTest.java @@ -123,7 +123,7 @@ public class OrcsPortingTest { private TransactionToken createBaselineBranchAndArtifacts() throws Exception { // set up the main branch - IOseeBranch branch = TokenFactory.createBranch("MainFromBranch"); + IOseeBranch branch = IOseeBranch.create("MainFromBranch"); branchApi.createTopLevelBranch(branch, author).call(); // baseline branch - set up artifacts on the main branch, and on the child branch @@ -151,7 +151,7 @@ public class OrcsPortingTest { private TransactionId createWorkingBranchChanges(IOseeBranch parentBranch, ArtifactId artifactToModify) throws Exception { // set up the child branch to copy to - IOseeBranch childBranch = TokenFactory.createBranch("childBranch"); + IOseeBranch childBranch = IOseeBranch.create("childBranch"); branchApi.createWorkingBranch(childBranch, author, parentBranch, ArtifactId.SENTINEL).call(); TransactionBuilder tx3 = txFactory.createTransaction(childBranch, author, "update second requirement"); @@ -184,7 +184,7 @@ public class OrcsPortingTest { private BranchId createCopyFromTransactionBranch(TransactionId transactionToCopy, ArtifactId assocaitedArt) throws Exception { // create the branch with the copied transaction - IOseeBranch branch = TokenFactory.createBranch(branchString); + IOseeBranch branch = IOseeBranch.create(branchString); // get the setup associated artifact - this is for a later test to make sure the branch is not duplicated // there should only be one port branch per associated artifact @@ -197,7 +197,7 @@ public class OrcsPortingTest { } private TransactionToken commitToDestinationBranch(BranchId copyTxBranch) throws Exception { - IOseeBranch destinationBranch = TokenFactory.createBranch("IndepToBranch"); + IOseeBranch destinationBranch = IOseeBranch.create("IndepToBranch"); branchApi.createTopLevelBranch(destinationBranch, author).call(); return branchApi.commitBranch(author, copyTxBranch, destinationBranch).call(); } diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java index 635383c62f0..f1555384396 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java @@ -546,7 +546,7 @@ public class OrcsQueryTest { } private BranchReadable setupNameEqualsArtifacts() throws Exception { - IOseeBranch branchToken = TokenFactory.createBranch("TestAndNameEquals"); + IOseeBranch branchToken = IOseeBranch.create("TestAndNameEquals"); BranchReadable branch = branchApi.createTopLevelBranch(branchToken, author).call(); TransactionBuilder tx = txFactory.createTransaction(branch, author, "add folders"); tx.createArtifact(CoreArtifactTypes.Folder, "First Folder"); diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java index 4f3a63798ba..e72485589c3 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java @@ -220,7 +220,7 @@ public class OrcsTransactionTest { assertEquals(SystemUser.Anonymous.getName(), userDup.getName()); // duplicate on different branch - IOseeBranch branchToken = TokenFactory.createBranch("DuplicateArtifact tests"); + IOseeBranch branchToken = IOseeBranch.create("DuplicateArtifact tests"); Callable<BranchReadable> callableBranch = orcsBranch.createTopLevelBranch(branchToken, userArtifact); BranchReadable topLevelBranch = callableBranch.call(); @@ -239,7 +239,7 @@ public class OrcsTransactionTest { public void testIntroduceArtifact() throws Exception { ArtifactReadable user = query.fromBranch(COMMON).andIds(SystemUser.Anonymous).getResults().getExactlyOne(); - IOseeBranch branchToken = TokenFactory.createBranch("IntroduceArtifact tests"); + IOseeBranch branchToken = IOseeBranch.create("IntroduceArtifact tests"); BranchReadable topLevelBranch = orcsBranch.createTopLevelBranch(branchToken, userArtifact).call(); TransactionBuilder transaction = diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTupleTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTupleTest.java index df67b6d9835..80875d8d4a2 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTupleTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTupleTest.java @@ -17,7 +17,6 @@ import java.util.List; import java.util.function.BiConsumer; import org.eclipse.osee.framework.core.data.ApplicabilityToken; import org.eclipse.osee.framework.core.data.ArtifactId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TupleTypeId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreTupleTypes; @@ -128,8 +127,7 @@ public class OrcsTupleTest { BiConsumer<Long, String> consumer = (id, name) -> result.add(new ApplicabilityToken(id, name)); orcsApi.getQueryFactory().tupleQuery().getTuple2KeyValuePair(CoreTupleTypes.ViewApplicability, - ArtifactId.valueOf(branchViewArts.getList().get(0).getId()), - TokenFactory.createBranch(DemoBranches.SAW_Bld_1.getId()), consumer); + ArtifactId.valueOf(branchViewArts.getList().get(0).getId()), DemoBranches.SAW_Bld_1, consumer); Assert.assertEquals(5, result.size()); } diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java index 98d878db43e..9d94ce5cfcb 100644 --- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java +++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/CreateBranchData.java @@ -13,7 +13,6 @@ package org.eclipse.osee.orcs.data; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.TransactionId; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.BranchType; /** @@ -40,7 +39,7 @@ public class CreateBranchData { private BranchId parentBranch; public CreateBranchData() { - this(TokenFactory.createBranch()); + this(BranchId.create()); } public CreateBranchData(BranchId branch) { |