Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2016-09-16 00:13:38 +0000
committerAngel Avila2016-09-16 00:13:38 +0000
commitb3674b42b5b563094b9aba00d5040a9e8454df66 (patch)
tree15762945bb6e8ed8601f7dbef8f897b654378649
parente7b1a79be0ee28cb50a0a10d525caa2d9084002b (diff)
downloadorg.eclipse.osee-b3674b42b5b563094b9aba00d5040a9e8454df66.tar.gz
org.eclipse.osee-b3674b42b5b563094b9aba00d5040a9e8454df66.tar.xz
org.eclipse.osee-b3674b42b5b563094b9aba00d5040a9e8454df66.zip
refactor: Rename IArtifactToken to ArtifactToken
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsServices.java4
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsArtifactToken.java50
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/IAtsChangeSet.java4
-rw-r--r--plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java4
-rw-r--r--plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java4
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/CreateTaskRuleTest.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/IAtsProgramManager.java6
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsGroup.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilClient.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsChangeSet.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionSheet.java8
-rw-r--r--plugins/org.eclipse.osee.ats.demo.api/src/org/eclipse/osee/ats/demo/api/DemoArtifactToken.java56
-rw-r--r--plugins/org.eclipse.osee.ats.demo.api/src/org/eclipse/osee/ats/demo/api/DemoTeam.java8
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java10
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/BaseConfigEndpointImpl.java6
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfig2DataExample.java6
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigOperation.java8
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java6
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/WorkPackageQBDReport.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/WorkPackageSearchProvider.java6
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java10
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionImporter.java4
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/MergeManagerTest.java4
-rw-r--r--plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/DataRightBuilder.java4
-rw-r--r--plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionTestUtil.java10
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/DispoConstants.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/ArtifactDataProvider.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/IBasicArtifact.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ArtifactToken.java63
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IArtifactToken.java23
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IUserToken.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java42
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTokens.java14
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeGroup.java10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeSystemArtifacts.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/SystemGroup.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java36
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/AccessTopicEventPayload.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifact.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/users/UserDataLoader.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/ViewApplicabilityUtil.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/OAuthTypes.java5
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryBuilderImpl.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java4
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java4
51 files changed, 259 insertions, 257 deletions
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsServices.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsServices.java
index e73c38be98..15464211bf 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsServices.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsServices.java
@@ -43,7 +43,7 @@ import org.eclipse.osee.ats.api.workflow.IAtsImplementerService;
import org.eclipse.osee.ats.api.workflow.IAtsWorkItemService;
import org.eclipse.osee.ats.api.workflow.transition.ITransitionListener;
import org.eclipse.osee.framework.core.data.ArtifactId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.logger.Log;
@@ -141,7 +141,7 @@ public interface IAtsServices extends IAtsConfigurationProvider, IWorkDefinition
Log getLogger();
- <T> T getConfigItem(IArtifactToken artifactToken);
+ <T> T getConfigItem(ArtifactToken artifactToken);
<T> T getConfigItem(String guid);
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsArtifactToken.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsArtifactToken.java
index 736dd09ee0..afe5888fd5 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsArtifactToken.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsArtifactToken.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.ats.api.data;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
@@ -19,59 +19,59 @@ import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
*/
public final class AtsArtifactToken {
- public static final IArtifactToken AtsConfig =
+ public static final ArtifactToken AtsConfig =
TokenFactory.createArtifactToken(5367053, "Af7L9SYYgCcBCKZ8CCwA", "ATS Config", CoreArtifactTypes.GeneralData);
- public static final IArtifactToken RuleDefinitions = TokenFactory.createArtifactToken(7880473,
+ public static final ArtifactToken RuleDefinitions = TokenFactory.createArtifactToken(7880473,
"Ar1Z9KIRtUZgcxbnyFwA", "Rule Definitions", AtsArtifactTypes.RuleDefinition);
- public static final IArtifactToken Users =
+ public static final ArtifactToken Users =
TokenFactory.createArtifactToken(95459, "AAABGTAGb+8BauB5Cw1QNA", "Users", CoreArtifactTypes.Folder);
- public static IArtifactToken HeadingFolder = TokenFactory.createArtifactToken(114713, "AAABER+3yR4A8O7WYQ+Xbw",
+ public static ArtifactToken HeadingFolder = TokenFactory.createArtifactToken(114713, "AAABER+3yR4A8O7WYQ+Xbw",
"Action Tracking System", CoreArtifactTypes.Folder);
- public static IArtifactToken TopTeamDefinition =
+ public static ArtifactToken TopTeamDefinition =
TokenFactory.createArtifactToken(56004, "AAABER+35b4A8O7WHrXTiA", "Teams", AtsArtifactTypes.TeamDefinition);
- public static IArtifactToken TopActionableItem = TokenFactory.createArtifactToken(122894, "AAABER+37QEA8O7WSQaqJQ",
+ public static ArtifactToken TopActionableItem = TokenFactory.createArtifactToken(122894, "AAABER+37QEA8O7WSQaqJQ",
"Actionable Items", AtsArtifactTypes.ActionableItem);
- public static IArtifactToken CountryFolder =
+ public static ArtifactToken CountryFolder =
TokenFactory.createArtifactToken(7968155, "AYi8V8esln8KJkjesqAA", "Countries", CoreArtifactTypes.Folder);
- public static IArtifactToken ProgramFolder =
+ public static ArtifactToken ProgramFolder =
TokenFactory.createArtifactToken(90442279, "AYi8V9LSJgjD2734BqQA", "Programs", CoreArtifactTypes.Folder);
- public static IArtifactToken ConfigFolder =
+ public static ArtifactToken ConfigFolder =
TokenFactory.createArtifactToken(113036, "AAABF4n18eYAc1ruQSSWdg", "Config", CoreArtifactTypes.Folder);
- public static IArtifactToken ConfigsFolder =
+ public static ArtifactToken ConfigsFolder =
TokenFactory.createArtifactToken(5086714, "BEmf1DEFnwkUqC9o3hwA", "Configs", CoreArtifactTypes.Folder);
- public static IArtifactToken WorkDefinitionsFolder =
+ public static ArtifactToken WorkDefinitionsFolder =
TokenFactory.createArtifactToken(284655, "ADTfjCLEj2DH2WYyeOgA", "Work Definitions", CoreArtifactTypes.Folder);
- public static IArtifactToken WebPrograms = TokenFactory.createArtifactToken(277592, "Awsk_RtncCochcuSxagA",
+ public static ArtifactToken WebPrograms = TokenFactory.createArtifactToken(277592, "Awsk_RtncCochcuSxagA",
"Web Programs", CoreArtifactTypes.UniversalGroup);
- public static IArtifactToken EVReportPrograms = TokenFactory.createArtifactToken(8174118, "ABPMYxe8_1EZYA8obTQA",
+ public static ArtifactToken EVReportPrograms = TokenFactory.createArtifactToken(8174118, "ABPMYxe8_1EZYA8obTQA",
"EV Report Programs", CoreArtifactTypes.UniversalGroup);
- public static IArtifactToken AtsAdmin =
+ public static ArtifactToken AtsAdmin =
TokenFactory.createArtifactToken(136750, "AAABHaItoVsAG6ZAAMyhQw", "AtsAdmin", CoreArtifactTypes.UserGroup);
- public static IArtifactToken AtsTempAdmin =
+ public static ArtifactToken AtsTempAdmin =
TokenFactory.createArtifactToken(5367074, "AAABHaItoVsAG7ZAAMyhQw", "AtsTempAdmin", CoreArtifactTypes.UserGroup);
// Default Work Definitions
- public static IArtifactToken WorkDef_Goal =
+ public static ArtifactToken WorkDef_Goal =
TokenFactory.createArtifactToken(142177, "BAB1YhIbUQWluN2+SVgA", "WorkDef_Goal", AtsArtifactTypes.WorkDefinition);
- public static IArtifactToken WorkDef_Review_Decision = TokenFactory.createArtifactToken(25335,
+ public static ArtifactToken WorkDef_Review_Decision = TokenFactory.createArtifactToken(25335,
"A__fwv3zpnS2oEVTaDQA", "WorkDef_Review_Decision", AtsArtifactTypes.WorkDefinition);
- public static IArtifactToken WorkDef_Review_PeerToPeer = TokenFactory.createArtifactToken(25334,
+ public static ArtifactToken WorkDef_Review_PeerToPeer = TokenFactory.createArtifactToken(25334,
"A__WLyb77Cl_diWCUmAA", "WorkDef_Review_PeerToPeer", AtsArtifactTypes.WorkDefinition);
- public static IArtifactToken WorkDef_Task_Default = TokenFactory.createArtifactToken(105373, "BABAJntqsGoKosWZtKgA",
+ public static ArtifactToken WorkDef_Task_Default = TokenFactory.createArtifactToken(105373, "BABAJntqsGoKosWZtKgA",
"WorkDef_Task_Default", AtsArtifactTypes.WorkDefinition);
- public static IArtifactToken WorkDef_Team_Default = TokenFactory.createArtifactToken(72301, "BADtJXMuZ1e9+5AgyRwA",
+ public static ArtifactToken WorkDef_Team_Default = TokenFactory.createArtifactToken(72301, "BADtJXMuZ1e9+5AgyRwA",
"WorkDef_Team_Default", AtsArtifactTypes.WorkDefinition);
- public static IArtifactToken WorkDef_Team_Simple = TokenFactory.createArtifactToken(72302, "BAEWlOp78DShE_gJymAA",
+ public static ArtifactToken WorkDef_Team_Simple = TokenFactory.createArtifactToken(72302, "BAEWlOp78DShE_gJymAA",
"WorkDef_Team_Simple", AtsArtifactTypes.WorkDefinition);
// Safety Workflow configuration
- public static final IArtifactToken SafetyActionableItem = TokenFactory.createArtifactToken(7244546,
+ public static final ArtifactToken SafetyActionableItem = TokenFactory.createArtifactToken(7244546,
"AKDKq_Ar2WLw+ntiAVgA", "System Safety", AtsArtifactTypes.ActionableItem);
- public static final IArtifactToken SafetyTeamDefinition = TokenFactory.createArtifactToken(7241589,
+ public static final ArtifactToken SafetyTeamDefinition = TokenFactory.createArtifactToken(7241589,
"AKDG_MAfzDSILQB_crAA", "System Safety Team", AtsArtifactTypes.TeamDefinition);
// Agile
- public static IArtifactToken TopAgileFolder =
+ public static ArtifactToken TopAgileFolder =
TokenFactory.createArtifactToken(6915493, "APFgz7OwBmpcrGt0DbQA", "Agile", CoreArtifactTypes.Folder);
private AtsArtifactToken() {
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/IAtsChangeSet.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/IAtsChangeSet.java
index cedb73d83b..01c7e40b60 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/IAtsChangeSet.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/IAtsChangeSet.java
@@ -19,7 +19,7 @@ import org.eclipse.osee.ats.api.user.IAtsUser;
import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow;
import org.eclipse.osee.ats.api.workflow.IAttribute;
import org.eclipse.osee.framework.core.data.ArtifactId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
@@ -88,7 +88,7 @@ public interface IAtsChangeSet {
<T> void setAttribute(IAtsWorkItem workItem, int attributeId, T value);
- ArtifactId createArtifact(IArtifactToken token);
+ ArtifactId createArtifact(ArtifactToken token);
void deleteArtifact(ArtifactId artifact);
diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java
index d33439edd8..ba71e452ae 100644
--- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java
@@ -54,7 +54,7 @@ import org.eclipse.osee.ats.demo.api.DemoArtifactTypes;
import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.util.FavoritesManager;
import org.eclipse.osee.ats.util.SubscribeManagerUI;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
@@ -306,7 +306,7 @@ public class PopulateDemoActions extends XNavigateItemAction {
}
}
- private Set<ActionArtifact> createActions(List<DemoDbActionData> actionDatas, IArtifactToken versionToken, TeamState toStateOverride, IAtsChangeSet changes) throws Exception {
+ private Set<ActionArtifact> createActions(List<DemoDbActionData> actionDatas, ArtifactToken versionToken, TeamState toStateOverride, IAtsChangeSet changes) throws Exception {
Set<ActionArtifact> actionArts = new HashSet<>();
int currNum = 1;
for (DemoDbActionData aData : actionDatas) {
diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java
index c7d053eff2..ccc146d9b1 100644
--- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java
@@ -36,7 +36,7 @@ import org.eclipse.osee.ats.demo.api.DemoProgram;
import org.eclipse.osee.ats.demo.api.DemoSubsystems;
import org.eclipse.osee.ats.demo.api.DemoUsers;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
import org.eclipse.osee.framework.database.init.IDbInitializationTask;
@@ -295,7 +295,7 @@ public class DemoDatabaseConfig implements IDbInitializationTask {
insertionActivityArt.addRelation(AtsRelationTypes.InsertionActivityToWorkPackage_WorkPackage, workPackageArt);
}
- private Artifact createWorkPackage(IArtifactToken workPackageToken, String activityId) throws OseeCoreException {
+ private Artifact createWorkPackage(ArtifactToken workPackageToken, String activityId) throws OseeCoreException {
Artifact workPkg1 = ArtifactTypeManager.addArtifact(workPackageToken, AtsUtilCore.getAtsBranch());
char charAt = workPackageToken.getName().charAt(workPackageToken.getName().length() - 1);
workPkg1.addAttributeFromString(AtsAttributeTypes.WorkPackageId, "WP_0" + charAt);
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/CreateTaskRuleTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/CreateTaskRuleTest.java
index d99c3b89c1..84151d5c7d 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/CreateTaskRuleTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/CreateTaskRuleTest.java
@@ -30,7 +30,7 @@ import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil
import org.eclipse.osee.ats.core.client.IAtsClient;
import org.eclipse.osee.ats.core.config.ActionableItems;
import org.eclipse.osee.ats.demo.api.DemoArtifactToken;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.junit.After;
@@ -84,7 +84,7 @@ public class CreateTaskRuleTest {
test(DemoArtifactToken.SAW_Test_AI, DemoArtifactToken.SAW_Test_AI, CREATE_TASK_ACTION_FROM_AI_TITLE);
}
- public void test(IArtifactToken configObjectToken, IArtifactToken actionableItem, String title) {
+ public void test(ArtifactToken configObjectToken, ArtifactToken actionableItem, String title) {
IAtsClient atsClient = AtsClientService.get();
Collection<IAtsRuleDefinition> allRuleDefs = atsClient.getWorkDefinitionAdmin().getAllRuleDefinitions();
Assert.assertEquals("We should have no rules", 0, allRuleDefs.size());
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/IAtsProgramManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/IAtsProgramManager.java
index 96833bf70e..a9776b2d62 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/IAtsProgramManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/IAtsProgramManager.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.ats.core.client.config;
import java.util.Collection;
import org.eclipse.osee.ats.api.program.IAtsProgram;
import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -34,8 +34,8 @@ public interface IAtsProgramManager {
public IAtsProgram getProgram(TeamWorkFlowArtifact teamArt) throws OseeCoreException;
- public IArtifactToken getReviewAssigneeUserGroup(TeamWorkFlowArtifact teamArt) throws OseeCoreException;
+ public ArtifactToken getReviewAssigneeUserGroup(TeamWorkFlowArtifact teamArt) throws OseeCoreException;
- public IArtifactToken getPidsReviewAssigneeUserGroup() throws OseeCoreException;
+ public ArtifactToken getPidsReviewAssigneeUserGroup() throws OseeCoreException;
}
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsGroup.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsGroup.java
index c13216c141..d9646dde7b 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsGroup.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsGroup.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.ats.core.client.util;
import org.eclipse.osee.ats.api.data.AtsArtifactToken;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.jdk.core.type.Id;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
@@ -30,7 +30,7 @@ public enum AtsGroup {
private final OseeGroup group;
- AtsGroup(IArtifactToken token) {
+ AtsGroup(ArtifactToken token) {
group = new OseeGroup(token);
}
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilClient.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilClient.java
index ff09ddbc48..c84444375e 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilClient.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUtilClient.java
@@ -23,7 +23,7 @@ import org.eclipse.osee.ats.api.workflow.transition.TransitionResults;
import org.eclipse.osee.ats.core.client.internal.Activator;
import org.eclipse.osee.ats.core.client.internal.AtsClientService;
import org.eclipse.osee.ats.core.util.AtsUtilCore;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.enums.Active;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Collections;
@@ -141,7 +141,7 @@ public class AtsUtilClient {
return toReturn;
}
- public static Artifact getFromToken(IArtifactToken token) {
+ public static Artifact getFromToken(ArtifactToken token) {
Artifact toReturn = null;
try {
toReturn = ArtifactQuery.getArtifactFromToken(token, AtsUtilCore.getAtsBranch());
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsChangeSet.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsChangeSet.java
index 9ebcaa14a2..d462d664ac 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsChangeSet.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsChangeSet.java
@@ -23,7 +23,7 @@ import org.eclipse.osee.ats.api.util.IAtsChangeSet;
import org.eclipse.osee.ats.api.util.IExecuteListener;
import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow;
import org.eclipse.osee.framework.core.data.ArtifactId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -116,7 +116,7 @@ public abstract class AbstractAtsChangeSet implements IAtsChangeSet {
}
@Override
- public ArtifactId createArtifact(IArtifactToken token) {
+ public ArtifactId createArtifact(ArtifactToken token) {
return createArtifact(token.getArtifactType(), token.getName(), token.getGuid(), token.getId());
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java
index e3bffcf57a..9358bbe563 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinitionAdmin;
import org.eclipse.osee.ats.api.workdef.IAttributeResolver;
import org.eclipse.osee.ats.api.workflow.IAttribute;
import org.eclipse.osee.framework.core.data.ArtifactId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
@@ -61,7 +61,7 @@ public abstract class AtsCoreServiceImpl implements IAtsServices {
}
@Override
- public <T> T getConfigItem(IArtifactToken artifactToken) {
+ public <T> T getConfigItem(ArtifactToken artifactToken) {
return getConfigItem(artifactToken.getId());
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionSheet.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionSheet.java
index a8b55c42ba..e4ccfcbfb8 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionSheet.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionSheet.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.ats.core.workdef;
import java.io.File;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
/**
* @author Donald G. Dunne
@@ -20,13 +20,13 @@ public class WorkDefinitionSheet {
public File file;
public String name;
- private final IArtifactToken token;
+ private final ArtifactToken token;
public WorkDefinitionSheet(String name, File file) {
this(name, file, null);
}
- public WorkDefinitionSheet(String name, File file, IArtifactToken asToken) {
+ public WorkDefinitionSheet(String name, File file, ArtifactToken asToken) {
super();
this.file = file;
this.name = name;
@@ -46,7 +46,7 @@ public class WorkDefinitionSheet {
return String.format("%s - file[%s]", name, file);
}
- public IArtifactToken getToken() {
+ public ArtifactToken getToken() {
return token;
}
}
diff --git a/plugins/org.eclipse.osee.ats.demo.api/src/org/eclipse/osee/ats/demo/api/DemoArtifactToken.java b/plugins/org.eclipse.osee.ats.demo.api/src/org/eclipse/osee/ats/demo/api/DemoArtifactToken.java
index a36a37a5c6..9437c8d83b 100644
--- a/plugins/org.eclipse.osee.ats.demo.api/src/org/eclipse/osee/ats/demo/api/DemoArtifactToken.java
+++ b/plugins/org.eclipse.osee.ats.demo.api/src/org/eclipse/osee/ats/demo/api/DemoArtifactToken.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.ats.demo.api;
import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
@@ -20,69 +20,69 @@ import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
*/
public final class DemoArtifactToken {
- public static final IArtifactToken SAW_Test_AI =
+ public static final ArtifactToken SAW_Test_AI =
TokenFactory.createArtifactToken(75881049, "ABirZS0j81dpAiAyqUwA", "SAW Test", AtsArtifactTypes.ActionableItem);
- public static final IArtifactToken SAW_Code_AI =
+ public static final ArtifactToken SAW_Code_AI =
TokenFactory.createArtifactToken(733306468, "ADubGYmXm0FaNNuDCdAA", "SAW Code", AtsArtifactTypes.ActionableItem);
- public static IArtifactToken Process_Team = TokenFactory.createArtifactToken(55170736, "At2WHxBtYhx4Nxrck6gA",
+ public static ArtifactToken Process_Team = TokenFactory.createArtifactToken(55170736, "At2WHxBtYhx4Nxrck6gA",
"Process_Team", AtsArtifactTypes.TeamDefinition);
- public static IArtifactToken Tools_Team =
+ public static ArtifactToken Tools_Team =
TokenFactory.createArtifactToken(4830548, "At2WHxCFyQPidx78iuAA", "Tools_Team", AtsArtifactTypes.TeamDefinition);
- public static final IArtifactToken SAW_Program =
+ public static final ArtifactToken SAW_Program =
TokenFactory.createArtifactToken(19196003, "At2WHxCeMCHacr02EkAA", "SAW Program", AtsArtifactTypes.Program);
- public static IArtifactToken SAW_HW =
+ public static ArtifactToken SAW_HW =
TokenFactory.createArtifactToken(2876840, "At2WHxCeMCHfcr02EkAA", "SAW HW", AtsArtifactTypes.TeamDefinition);
- public static IArtifactToken SAW_Code =
+ public static ArtifactToken SAW_Code =
TokenFactory.createArtifactToken(30013695, "At2WHxC2lxLOGB0YiuQA", "SAW Code", AtsArtifactTypes.TeamDefinition);
- public static IArtifactToken SAW_Test =
+ public static ArtifactToken SAW_Test =
TokenFactory.createArtifactToken(31608252, "At2WHxDuXkCIJFEtQ0AA", "SAW Test", AtsArtifactTypes.TeamDefinition);
- public static IArtifactToken SAW_SW_Design = TokenFactory.createArtifactToken(138220, "At2WHxEGxl7nWuqx7FQA",
+ public static ArtifactToken SAW_SW_Design = TokenFactory.createArtifactToken(138220, "At2WHxEGxl7nWuqx7FQA",
"SAW SW Design", AtsArtifactTypes.TeamDefinition);
- public static IArtifactToken SAW_Requirements = TokenFactory.createArtifactToken(20592, "At2WHxEfLXfCLytmLlAA",
+ public static ArtifactToken SAW_Requirements = TokenFactory.createArtifactToken(20592, "At2WHxEfLXfCLytmLlAA",
"SAW Requirements", AtsArtifactTypes.TeamDefinition);
- public static IArtifactToken SAW_SW =
+ public static ArtifactToken SAW_SW =
TokenFactory.createArtifactToken(3902389, "At2WHxFk5VVE2cafF5AA", "SAW SW", AtsArtifactTypes.TeamDefinition);
- public static IArtifactToken SAW_CSCI_AI =
+ public static ArtifactToken SAW_CSCI_AI =
TokenFactory.createArtifactToken(1866, "AZ2uRHybOnvKPIuRqKAA", "SAW CSCI", AtsArtifactTypes.ActionableItem);
// SAW_SW Versions
- public static IArtifactToken SAW_Bld_1 =
+ public static ArtifactToken SAW_Bld_1 =
TokenFactory.createArtifactToken(2749182, "A8msa8LTDG36oWAnq3QA", "SAW_Bld_1", AtsArtifactTypes.Version);
- public static IArtifactToken SAW_Bld_2 =
+ public static ArtifactToken SAW_Bld_2 =
TokenFactory.createArtifactToken(7632957, "A8YqcqyKh3HCkcHfEVwA", "SAW_Bld_2", AtsArtifactTypes.Version);
- public static IArtifactToken SAW_Bld_3 =
+ public static ArtifactToken SAW_Bld_3 =
TokenFactory.createArtifactToken(577781, "A8msa8LrcxhyrUTsbuwA", "SAW_Bld_3", AtsArtifactTypes.Version);
- public static final IArtifactToken CIS_Program =
+ public static final ArtifactToken CIS_Program =
TokenFactory.createArtifactToken(8242414, "At2WHxCeMCHbcr02EkAA", "CIS Program", AtsArtifactTypes.Program);
- public static IArtifactToken CIS_SW =
+ public static ArtifactToken CIS_SW =
TokenFactory.createArtifactToken(695910, "At2WHxF7jmUa8jXR3iwA", "CIS_SW", AtsArtifactTypes.TeamDefinition);
- public static IArtifactToken CIS_Code =
+ public static ArtifactToken CIS_Code =
TokenFactory.createArtifactToken(1629262, "At2WHxGo4A1nnGWYjgwA", "CIS_Code", AtsArtifactTypes.TeamDefinition);
- public static IArtifactToken CIS_Test =
+ public static ArtifactToken CIS_Test =
TokenFactory.createArtifactToken(541255, "At2WHxHZrl0bKPA6uUgA", "CIS_Test", AtsArtifactTypes.TeamDefinition);
- public static IArtifactToken Facilities_Team =
+ public static ArtifactToken Facilities_Team =
TokenFactory.createArtifactToken(4811031, "At2WHxIMOz66yR56eRAA", "Facilities_Team", CoreArtifactTypes.Folder);
- public static IArtifactToken DemoPrograms =
+ public static ArtifactToken DemoPrograms =
TokenFactory.createArtifactToken(90120, "Awsk_RtnczAchcuSxagA", "Demo Programs", CoreArtifactTypes.Artifact);
- public static IArtifactToken SAW_Code_Team_WorkPackage_01 =
+ public static ArtifactToken SAW_Code_Team_WorkPackage_01 =
TokenFactory.createArtifactToken(38512616, "AZp8M1dPuESWYBPPbDgA", "Work Pkg 01", AtsArtifactTypes.WorkPackage);
- public static IArtifactToken SAW_Code_Team_WorkPackage_02 =
+ public static ArtifactToken SAW_Code_Team_WorkPackage_02 =
TokenFactory.createArtifactToken(513994, "AZp8M1d7TCJiBw6A5bgA", "Work Pkg 02", AtsArtifactTypes.WorkPackage);
- public static IArtifactToken SAW_Code_Team_WorkPackage_03 =
+ public static ArtifactToken SAW_Code_Team_WorkPackage_03 =
TokenFactory.createArtifactToken(304908, "AZp8M1em4EC1xE6bPEwA", "Work Pkg 03", AtsArtifactTypes.WorkPackage);
- public static IArtifactToken SAW_Test_AI_WorkPackage_0A =
+ public static ArtifactToken SAW_Test_AI_WorkPackage_0A =
TokenFactory.createArtifactToken(75666, "AZp8M1fSc1JwMDQBtLwA", "Work Pkg 0A", AtsArtifactTypes.WorkPackage);
- public static IArtifactToken SAW_Test_AI_WorkPackage_0B =
+ public static ArtifactToken SAW_Test_AI_WorkPackage_0B =
TokenFactory.createArtifactToken(281326, "AZp8M1hP81QOm6W9yNgA", "Work Pkg 0B", AtsArtifactTypes.WorkPackage);
- public static IArtifactToken SAW_Test_AI_WorkPackage_0C =
+ public static ArtifactToken SAW_Test_AI_WorkPackage_0C =
TokenFactory.createArtifactToken(8141323, "AZp8M1kvEGrRt9tybTwA", "Work Pkg 0C", AtsArtifactTypes.WorkPackage);
private DemoArtifactToken() {
diff --git a/plugins/org.eclipse.osee.ats.demo.api/src/org/eclipse/osee/ats/demo/api/DemoTeam.java b/plugins/org.eclipse.osee.ats.demo.api/src/org/eclipse/osee/ats/demo/api/DemoTeam.java
index 75703fc193..7418101a29 100644
--- a/plugins/org.eclipse.osee.ats.demo.api/src/org/eclipse/osee/ats/demo/api/DemoTeam.java
+++ b/plugins/org.eclipse.osee.ats.demo.api/src/org/eclipse/osee/ats/demo/api/DemoTeam.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.ats.demo.api;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
/**
* Convenience method for demo plugin to retrieve configured teams for use mostly in DemoNavigateViewItem.
@@ -31,13 +31,13 @@ public enum DemoTeam {
CIS_Test(DemoArtifactToken.CIS_Test),
Facilities_Team(DemoArtifactToken.Facilities_Team);
- private final IArtifactToken teamDefToken;
+ private final ArtifactToken teamDefToken;
- private DemoTeam(IArtifactToken teamDefToken) {
+ private DemoTeam(ArtifactToken teamDefToken) {
this.teamDefToken = teamDefToken;
}
- public IArtifactToken getTeamDefToken() {
+ public ArtifactToken getTeamDefToken() {
return teamDefToken;
}
}
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 fd00d9be80..6eae0c92f5 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
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.osee.ats.rest.internal.config;
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import javax.ws.rs.GET;
@@ -37,7 +39,7 @@ import org.eclipse.osee.ats.core.users.AtsCoreUsers;
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.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreArtifactTokens;
import org.eclipse.osee.framework.core.enums.CoreBranches;
@@ -53,8 +55,6 @@ import org.eclipse.osee.orcs.OrcsApi;
import org.eclipse.osee.orcs.data.ArtifactReadable;
import org.eclipse.osee.orcs.data.BranchReadable;
import org.eclipse.osee.orcs.transaction.TransactionBuilder;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
/**
* @author Donald G. Dunne
@@ -76,7 +76,6 @@ public final class AtsConfigEndpointImpl implements AtsConfigEndpointApi {
private Supplier<AtsConfigurations> getConfigurationsSupplier() {
return new Supplier<AtsConfigurations>() {
- @SuppressWarnings("unchecked")
@Override
public AtsConfigurations get() {
ResultSet<ArtifactReadable> artifacts =
@@ -213,8 +212,7 @@ public final class AtsConfigEndpointImpl implements AtsConfigEndpointApi {
tx.commit();
}
- @SuppressWarnings("unchecked")
- private ArtifactId introduceAndRelateTo(TransactionBuilder tx, org.eclipse.osee.orcs.data.BranchReadable fromBranch, IArtifactToken introToken, BranchReadable newBranch, IArtifactToken relateToToken, ArtifactId relateToArt) {
+ private ArtifactId introduceAndRelateTo(TransactionBuilder tx, org.eclipse.osee.orcs.data.BranchReadable fromBranch, ArtifactToken introToken, BranchReadable newBranch, ArtifactToken relateToToken, ArtifactId relateToArt) {
ArtifactReadable introArt =
orcsApi.getQueryFactory().fromBranch(fromBranch).andIds(introToken).getResults().getAtMostOneOrNull();
if (introArt == null) {
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/BaseConfigEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/BaseConfigEndpointImpl.java
index 2370a05e11..fc878300f4 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/BaseConfigEndpointImpl.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/BaseConfigEndpointImpl.java
@@ -27,7 +27,7 @@ import org.eclipse.osee.ats.api.util.IAtsChangeSet;
import org.eclipse.osee.ats.core.users.AtsCoreUsers;
import org.eclipse.osee.ats.rest.IAtsServer;
import org.eclipse.osee.framework.core.data.ArtifactId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
@@ -42,9 +42,9 @@ public abstract class BaseConfigEndpointImpl<T extends JaxAtsObject> implements
protected final IAtsServer atsServer;
protected final IArtifactType artifactType;
- protected final IArtifactToken typeFolder;
+ protected final ArtifactToken typeFolder;
- public BaseConfigEndpointImpl(IArtifactType artifactType, IArtifactToken typeFolder, IAtsServer atsServer) {
+ public BaseConfigEndpointImpl(IArtifactType artifactType, ArtifactToken typeFolder, IAtsServer atsServer) {
this.artifactType = artifactType;
this.typeFolder = typeFolder;
this.atsServer = atsServer;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfig2DataExample.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfig2DataExample.java
index 23069b7b9b..8dfe79cfa0 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfig2DataExample.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfig2DataExample.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.ats.core.util.AtsUtilCore;
import org.eclipse.osee.ats.core.workdef.WorkDefinitionSheet;
import org.eclipse.osee.ats.internal.Activator;
import org.eclipse.osee.ats.workdef.AtsWorkDefinitionSheetProviders;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -34,9 +34,9 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
*/
public class AtsConfig2DataExample extends AbstractAtsConfig2Data {
- public static IArtifactToken Software_Team = TokenFactory.createArtifactToken(4696084, "AGZs2EW0tWRkIv3OqfAA",
+ public static ArtifactToken Software_Team = TokenFactory.createArtifactToken(4696084, "AGZs2EW0tWRkIv3OqfAA",
"AtsConfig2 Software", AtsArtifactTypes.TeamDefinition);
- public static IArtifactToken Requirements_Team = TokenFactory.createArtifactToken(4696085, "AGZs2EU1d3db9M57WJQA",
+ public static ArtifactToken Requirements_Team = TokenFactory.createArtifactToken(4696085, "AGZs2EU1d3db9M57WJQA",
"AtsConfig2 Requirements", AtsArtifactTypes.TeamDefinition);
public AtsConfig2DataExample() {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigOperation.java
index 00a6f0dcbd..98a4776763 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigOperation.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigOperation.java
@@ -40,7 +40,7 @@ import org.eclipse.osee.ats.internal.AtsClientService;
import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.workdef.AtsWorkDefinitionSheetProviders;
import org.eclipse.osee.ats.workdef.provider.AtsWorkDefinitionImporter;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.PresentationType;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
@@ -75,8 +75,8 @@ public class AtsConfigOperation extends AbstractOperation {
private IAtsTeamDefinition teamDefinition;
private Collection<IAtsActionableItem> actionableItems;
private IAtsWorkDefinition workDefinition = null;
- private IArtifactToken teamDefToken = null;
- private IArtifactToken actionableItemToken = null;
+ private ArtifactToken teamDefToken = null;
+ private ArtifactToken actionableItemToken = null;
/**
* @param teamDefName - name of team definition to use
@@ -91,7 +91,7 @@ public class AtsConfigOperation extends AbstractOperation {
this.actionableItemsNames = actionableItems;
}
- public AtsConfigOperation(String name, IArtifactToken teamDefToken, Collection<String> versionNames, IArtifactToken actionableItemToken) {
+ public AtsConfigOperation(String name, ArtifactToken teamDefToken, Collection<String> versionNames, ArtifactToken actionableItemToken) {
this(name, teamDefToken.getName(), versionNames, Arrays.asList(actionableItemToken.getName()));
this.teamDefToken = teamDefToken;
this.actionableItemToken = actionableItemToken;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java
index 91ab82c4dc..966922ea69 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java
@@ -29,7 +29,7 @@ import org.eclipse.osee.ats.core.util.AtsUtilCore;
import org.eclipse.osee.ats.internal.AtsClientService;
import org.eclipse.osee.ats.workdef.AtsWorkDefinitionSheetProviders;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
@@ -107,7 +107,7 @@ public class AtsDatabaseConfig implements IDbInitializationTask {
rootArt.addChild(headingArt);
headingArt.persist(transaction);
}
- for (IArtifactToken token : Arrays.asList(AtsArtifactToken.TopActionableItem, AtsArtifactToken.TopTeamDefinition,
+ for (ArtifactToken token : Arrays.asList(AtsArtifactToken.TopActionableItem, AtsArtifactToken.TopTeamDefinition,
AtsArtifactToken.WorkDefinitionsFolder)) {
Artifact art = OseeSystemArtifacts.getOrCreateArtifact(token, atsBranch);
headingArt.addChild(art);
@@ -127,7 +127,7 @@ public class AtsDatabaseConfig implements IDbInitializationTask {
}
}
- public static void organizePrograms(IArtifactType programType, IArtifactToken programFolderToken) {
+ public static void organizePrograms(IArtifactType programType, ArtifactToken programFolderToken) {
SkynetTransaction transaction =
TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), "Organize Programs");
Artifact programFolder = OseeSystemArtifacts.getOrCreateArtifact(programFolderToken, AtsUtilCore.getAtsBranch());
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/WorkPackageQBDReport.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/WorkPackageQBDReport.java
index 9645b5d344..2fab27d67d 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/WorkPackageQBDReport.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/WorkPackageQBDReport.java
@@ -24,7 +24,7 @@ import org.eclipse.osee.ats.world.WorldEditor;
import org.eclipse.osee.ats.world.WorldEditorSimpleSearchProvider;
import org.eclipse.osee.ats.world.WorldEditorSimpleSearchProvider.IWorldEditorSimpleSearchProvider;
import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
@@ -63,7 +63,7 @@ public class WorkPackageQBDReport extends XNavigateItemAction implements IWorldE
@Override
public Collection<Artifact> performSearch(SearchType searchType) {
- List<IArtifactToken> workItemTokens =
+ List<ArtifactToken> workItemTokens =
ArtifactQuery.getArtifactTokenListFromSoleAttributeInherited(AtsArtifactTypes.AbstractWorkflowArtifact,
AtsAttributeTypes.WorkPackageGuid, selectedWorkPackage.getGuid(), AtsUtilCore.getAtsBranch());
List<Artifact> workItems = ArtifactQuery.getArtifactListFromTokens(workItemTokens, AtsUtilCore.getAtsBranch());
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/WorkPackageSearchProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/WorkPackageSearchProvider.java
index f83f4ed061..dae5ead664 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/WorkPackageSearchProvider.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/WorkPackageSearchProvider.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.ats.api.ev.IAtsWorkPackage;
import org.eclipse.osee.ats.column.WorkPackageFilterTreeDialog.IWorkPackageProvider;
import org.eclipse.osee.ats.core.util.AtsUtilCore;
import org.eclipse.osee.ats.internal.AtsClientService;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -33,7 +33,7 @@ public class WorkPackageSearchProvider implements IWorkPackageProvider {
@Override
public Collection<IAtsWorkPackage> getActiveWorkPackages() {
- Collection<IArtifactToken> selectableWorkPackageTokens =
+ Collection<ArtifactToken> selectableWorkPackageTokens =
ArtifactQuery.getArtifactTokenListFromTypeAndActive(AtsArtifactTypes.WorkPackage, AtsUtilCore.getAtsBranch());
Collection<IAtsWorkPackage> items = new LinkedList<>();
for (Artifact art : ArtifactQuery.getArtifactListFromTokens(selectableWorkPackageTokens,
@@ -45,7 +45,7 @@ public class WorkPackageSearchProvider implements IWorkPackageProvider {
@Override
public Collection<IAtsWorkPackage> getAllWorkPackages() {
- Collection<IArtifactToken> selectableWorkPackageTokens =
+ Collection<ArtifactToken> selectableWorkPackageTokens =
ArtifactQuery.getArtifactTokenListFromType(AtsArtifactTypes.WorkPackage, AtsUtilCore.getAtsBranch());
Collection<IAtsWorkPackage> items = new LinkedList<>();
for (Artifact art : ArtifactQuery.getArtifactListFromTokens(selectableWorkPackageTokens,
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java
index ec62381cb3..194eb752b2 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.ats.navigate;
+import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
@@ -39,8 +40,7 @@ import org.eclipse.osee.ats.internal.Activator;
import org.eclipse.osee.ats.internal.AtsClientService;
import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.world.WorldXNavigateItemAction;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
-import org.eclipse.osee.framework.core.data.TokenFactory;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.util.XResultData;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
@@ -65,9 +65,9 @@ import org.eclipse.osee.framework.ui.swt.Displays;
public class AtsRemoteEventTestItem extends WorldXNavigateItemAction {
XResultData resultData;
- IArtifactToken SAW_Bld_1 = TokenFactory.createArtifactToken(2749182, "SAW_Bld_1", AtsArtifactTypes.Version);
- IArtifactToken SAW_Bld_2 = TokenFactory.createArtifactToken(7632957, "SAW_Bld_2", AtsArtifactTypes.Version);
- IArtifactToken SAW_Bld_3 = TokenFactory.createArtifactToken(577781, "SAW_Bld_3", AtsArtifactTypes.Version);
+ ArtifactToken SAW_Bld_1 = ArtifactToken.valueOf(2749182, "SAW_Bld_1", COMMON, AtsArtifactTypes.Version);
+ ArtifactToken SAW_Bld_2 = ArtifactToken.valueOf(7632957, "SAW_Bld_2", COMMON, AtsArtifactTypes.Version);
+ ArtifactToken SAW_Bld_3 = ArtifactToken.valueOf(577781, "SAW_Bld_3", COMMON, AtsArtifactTypes.Version);
public AtsRemoteEventTestItem(XNavigateItem parent) {
super(parent, "ATS Remote Event Test");
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionImporter.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionImporter.java
index 7056e55653..4af13f48ec 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionImporter.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/AtsWorkDefinitionImporter.java
@@ -27,7 +27,7 @@ import org.eclipse.osee.ats.dsl.atsDsl.WorkDef;
import org.eclipse.osee.ats.internal.Activator;
import org.eclipse.osee.ats.internal.AtsClientService;
import org.eclipse.osee.ats.workdef.AtsDslUtil;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
import org.eclipse.osee.framework.core.util.XResultData;
@@ -83,7 +83,7 @@ public class AtsWorkDefinitionImporter {
return null;
}
- public Artifact importWorkDefinitionToDb(String workDefXml, String workDefName, String sheetName, IArtifactToken token, XResultData resultData, IAtsChangeSet changes) throws OseeCoreException {
+ public Artifact importWorkDefinitionToDb(String workDefXml, String workDefName, String sheetName, ArtifactToken token, XResultData resultData, IAtsChangeSet changes) throws OseeCoreException {
Artifact artifact = null;
try {
if (token != null) {
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/MergeManagerTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/MergeManagerTest.java
index d8cadf83f6..7319ca016f 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/MergeManagerTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/MergeManagerTest.java
@@ -23,7 +23,7 @@ import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule;
import org.eclipse.osee.client.test.framework.OseeLogMonitorRule;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
@@ -61,7 +61,7 @@ public class MergeManagerTest {
private IOseeBranch workingBranch;
private static Artifact newArt;
- public static IArtifactToken NewArtifactToken = TokenFactory.createArtifactToken(3534859, "AAABER+3yR4A8O7WYQ+Xaw",
+ public static ArtifactToken NewArtifactToken = TokenFactory.createArtifactToken(3534859, "AAABER+3yR4A8O7WYQ+Xaw",
"ART_NAME", CoreArtifactTypes.SoftwareRequirement);
private static final int DELETE_MERGE = 2;
diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/DataRightBuilder.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/DataRightBuilder.java
index 006e4ea4a5..785e0ac61d 100644
--- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/DataRightBuilder.java
+++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/DataRightBuilder.java
@@ -25,7 +25,7 @@ import org.eclipse.osee.define.report.api.DataRightId;
import org.eclipse.osee.define.report.api.DataRightInput;
import org.eclipse.osee.define.report.api.DataRightResult;
import org.eclipse.osee.define.report.api.PageOrientation;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
@@ -44,7 +44,7 @@ public class DataRightBuilder {
private final OrcsApi orcsApi;
- private static final IArtifactToken MAPPING_ARTIFACT = TokenFactory.createArtifactToken(5443258,
+ private static final ArtifactToken MAPPING_ARTIFACT = TokenFactory.createArtifactToken(5443258,
"AOkJ_kFNbEXCS7UjmfwA", "DataRightsFooters", CoreArtifactTypes.GeneralData);
public DataRightBuilder(OrcsApi orcsApi) {
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 222e1d87e8..ad5c7c47fc 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
@@ -11,7 +11,7 @@
package org.eclipse.osee.disposition.rest.integration.util;
import org.eclipse.osee.disposition.rest.DispoConstants;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.data.TokenFactory;
@@ -20,10 +20,10 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
*/
public class DispositionTestUtil {
// @formatter:off
- public static final IArtifactToken DISPO_SET_DEMO = TokenFactory.createArtifactToken(663199, "BJAg0ZVHHA7oDqY_LcgA", "Dispo Set Demo", DispoConstants.DispoSet);
- public static final IArtifactToken DISPO_SET_DEV = TokenFactory.createArtifactToken(433652, "BJCzD1ZijxOCjL+n7pAA", "Dispo Set Dev", DispoConstants.DispoSet);
- public static final IArtifactToken DISPO_ITEM_DEV_ONE = TokenFactory.createArtifactToken(8702337, "BJEiM7sbfDZjtkJ9JSAA", "Dispo Item Dev One", DispoConstants.DispoItem);
- public static final IArtifactToken DISPO_ITEM_DEMO_ONE = TokenFactory.createArtifactToken(4132534, "BJEiNETyAGTDpW4ZnrAA", "Dispo Item Demo One", DispoConstants.DispoItem);
+ public static final ArtifactToken DISPO_SET_DEMO = TokenFactory.createArtifactToken(663199, "BJAg0ZVHHA7oDqY_LcgA", "Dispo Set Demo", DispoConstants.DispoSet);
+ public static final ArtifactToken DISPO_SET_DEV = TokenFactory.createArtifactToken(433652, "BJCzD1ZijxOCjL+n7pAA", "Dispo Set Dev", DispoConstants.DispoSet);
+ 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");
// @formatter:on
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/DispoConstants.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/DispoConstants.java
index e6f73f954a..6d44b8e5fb 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/DispoConstants.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/DispoConstants.java
@@ -10,7 +10,8 @@
*******************************************************************************/
package org.eclipse.osee.disposition.rest;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.TokenFactory;
@@ -49,7 +50,7 @@ public final class DispoConstants {
public static final IAttributeType DispoItemMethodNumber = TokenFactory.createAttributeType(0x3000000000000214L, "dispo.Method Number");
- public static final IArtifactToken DISPO_ARTIFACT = TokenFactory.createArtifactToken(4757831L, "DispositionTypes", CoreArtifactTypes.OseeTypeDefinition);
+ public static final ArtifactToken DISPO_ARTIFACT = ArtifactToken.valueOf(4757831, "DispositionTypes", COMMON, CoreArtifactTypes.OseeTypeDefinition);
// @formatter:on
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/ArtifactDataProvider.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/ArtifactDataProvider.java
index 736e6152fc..5b65989c0f 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/ArtifactDataProvider.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/ArtifactDataProvider.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.framework.core.dsl.integration;
import java.util.Collection;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
@@ -24,7 +24,7 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
*/
public interface ArtifactDataProvider {
- public static interface ArtifactProxy extends IArtifactToken {
+ public static interface ArtifactProxy extends ArtifactToken {
@Override
String getName();
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/IBasicArtifact.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/IBasicArtifact.java
index ecb6d07390..0dfa020a98 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/IBasicArtifact.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/IBasicArtifact.java
@@ -10,14 +10,14 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.model;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
/**
* @author Roberto E. Escobar
*/
-public interface IBasicArtifact<T> extends IArtifactToken {
+public interface IBasicArtifact<T> extends ArtifactToken {
int getArtId();
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ArtifactToken.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ArtifactToken.java
new file mode 100644
index 0000000000..12c368b158
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ArtifactToken.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.framework.core.data;
+
+import org.eclipse.osee.framework.jdk.core.type.NamedId;
+
+/**
+ * @author Ryan D. Brooks
+ * @author Donald G. Dunne
+ */
+public interface ArtifactToken extends ArtifactId, HasArtifactType, HasBranch {
+ default ArtifactTypeId getArtifactTypeId() {
+ return null;
+ }
+
+ public static ArtifactToken valueOf(long id, String name, BranchId branch, IArtifactType artifactType) {
+ return valueOf(id, null, name, branch, artifactType);
+ }
+
+ public static ArtifactToken valueOf(long id, String guid, String name, BranchId branch, IArtifactType artifactType) {
+ final class ArtifactTokenImpl extends NamedId implements ArtifactToken {
+ private final BranchId branch;
+ private final IArtifactType artifactType;
+ private final String guid;
+
+ public ArtifactTokenImpl(Long id, String guid, String name, BranchId branch, IArtifactType artifactType) {
+ super(id, name);
+ this.branch = branch;
+ this.artifactType = artifactType;
+ this.guid = guid;
+ }
+
+ @Override
+ public IArtifactType getArtifactType() {
+ return artifactType;
+ }
+
+ @Override
+ public BranchId getBranch() {
+ return branch;
+ }
+
+ @Override
+ public String getGuid() {
+ return guid;
+ }
+
+ @Override
+ public Long getUuid() {
+ return getId();
+ }
+ }
+ return new ArtifactTokenImpl(id, guid, name, branch, artifactType);
+ }
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IArtifactToken.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IArtifactToken.java
deleted file mode 100644
index babb8c07c0..0000000000
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IArtifactToken.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.data;
-
-/**
- * @author Ryan D. Brooks
- * @author Donald G. Dunne
- */
-public interface IArtifactToken extends ArtifactId, HasArtifactType, HasBranch {
- // composition interface requires no additional methods,fields
-
- default ArtifactTypeId getArtifactTypeId() {
- return null;
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IUserToken.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IUserToken.java
index ed54e76157..a7ac6d6171 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IUserToken.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IUserToken.java
@@ -15,7 +15,7 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
/**
* @author Donald G. Dunne
*/
-public interface IUserToken extends IArtifactToken {
+public interface IUserToken extends ArtifactToken {
public String getUserId() throws OseeCoreException;
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 4806114161..90470a21b8 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
@@ -65,20 +65,8 @@ public final class TokenFactory {
return new AccessContextIdToken(guid, name);
}
- public static ArtifactId createArtifactId(Long uuid) {
- return new ArtifactToken(uuid, null, null, null);
- }
-
- public static IArtifactToken createArtifactToken(long uuid, String name, IArtifactType artifactType) {
- Conditions.checkExpressionFailOnTrue(uuid <= 0, "Artifact Token Uuid must be > 0 for token [%s] type [%s]", name,
- artifactType);
- return new ArtifactToken(uuid, null, name, artifactType);
- }
-
- public static IArtifactToken createArtifactToken(long uuid, String guid, String name, IArtifactType artifactType) {
- Conditions.checkExpressionFailOnTrue(uuid <= 0, "Artifact Token Uuid must be > 0 for token [%s] type [%s]", name,
- artifactType);
- return new ArtifactToken(uuid, guid, name, artifactType);
+ public static ArtifactToken createArtifactToken(long id, String guid, String name, IArtifactType artifactType) {
+ return ArtifactToken.valueOf(id, guid, name, BranchId.SENTINEL, artifactType);
}
public static IUserToken createUserToken(long uuid, String guid, String name, String email, String userId, boolean active, boolean admin, boolean creationRequired) {
@@ -149,32 +137,6 @@ public final class TokenFactory {
}
}
- private static class ArtifactToken extends NamedIdentity<String> implements IArtifactToken {
- private final IArtifactType artifactType;
- private final long id;
-
- public ArtifactToken(long id, String guid, String name, IArtifactType artifactType) {
- super(guid, name);
- this.id = id;
- this.artifactType = artifactType;
- }
-
- @Override
- public IArtifactType getArtifactType() {
- return artifactType;
- }
-
- @Override
- public ArtifactTypeId getArtifactTypeId() {
- return artifactType;
- }
-
- @Override
- public Long getId() {
- return id;
- }
- }
-
private static class UserToken extends NamedId implements IUserToken {
private final String userId;
private final boolean active;
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTokens.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTokens.java
index 1e1799699d..382fb37714 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTokens.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTokens.java
@@ -10,18 +10,18 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.enums;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.TokenFactory;
public final class CoreArtifactTokens {
// @formatter:off
- public static IArtifactToken DefaultHierarchyRoot = TokenFactory.createArtifactToken(197818, "AEslkN+d4hWXjQvnZ1gA", "Default Hierarchy Root", CoreArtifactTypes.RootArtifact);
- public static IArtifactToken UniversalGroupRoot = TokenFactory.createArtifactToken(60807, "AExdLMeOTGhhPY4CyvQA", "Root Artifact", CoreArtifactTypes.UniversalGroup);
- public static IArtifactToken Everyone = TokenFactory.createArtifactToken(48656, "AAABEbn4DKoAaR82FZsL3A", "Everyone", CoreArtifactTypes.UserGroup);
- public static IArtifactToken OseeAdmin = TokenFactory.createArtifactToken(52247, "AAABHaItmnUAG6ZAYlFKag", "OseeAdmin", CoreArtifactTypes.UserGroup);
- public static IArtifactToken OseeAccessAdmin = TokenFactory.createArtifactToken(8033605, "AGXiIJi2qxZnuXEdZVwA", "OseeAccessAdmin", CoreArtifactTypes.UserGroup);
- public static IArtifactToken UserGroups = TokenFactory.createArtifactToken(80920, "AAABGTAGNY8BauB5GajiIQ", "User Groups", CoreArtifactTypes.Folder);
+ public static ArtifactToken DefaultHierarchyRoot = TokenFactory.createArtifactToken(197818, "AEslkN+d4hWXjQvnZ1gA", "Default Hierarchy Root", CoreArtifactTypes.RootArtifact);
+ public static ArtifactToken UniversalGroupRoot = TokenFactory.createArtifactToken(60807, "AExdLMeOTGhhPY4CyvQA", "Root Artifact", CoreArtifactTypes.UniversalGroup);
+ public static ArtifactToken Everyone = TokenFactory.createArtifactToken(48656, "AAABEbn4DKoAaR82FZsL3A", "Everyone", CoreArtifactTypes.UserGroup);
+ public static ArtifactToken OseeAdmin = TokenFactory.createArtifactToken(52247, "AAABHaItmnUAG6ZAYlFKag", "OseeAdmin", CoreArtifactTypes.UserGroup);
+ public static ArtifactToken OseeAccessAdmin = TokenFactory.createArtifactToken(8033605, "AGXiIJi2qxZnuXEdZVwA", "OseeAccessAdmin", CoreArtifactTypes.UserGroup);
+ public static ArtifactToken UserGroups = TokenFactory.createArtifactToken(80920, "AAABGTAGNY8BauB5GajiIQ", "User Groups", CoreArtifactTypes.Folder);
// @formatter:on
private CoreArtifactTokens() {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeGroup.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeGroup.java
index db9a165eb1..a81dad59cd 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeGroup.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeGroup.java
@@ -15,7 +15,7 @@ import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED
import java.util.HashMap;
import java.util.Map;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.enums.CoreArtifactTokens;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -29,10 +29,10 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
public class OseeGroup {
private Artifact groupArtifact;
- private final Map<IArtifactToken, Boolean> temporaryOverride = new HashMap<>();
- private final IArtifactToken token;
+ private final Map<ArtifactToken, Boolean> temporaryOverride = new HashMap<>();
+ private final ArtifactToken token;
- public OseeGroup(IArtifactToken token) {
+ public OseeGroup(ArtifactToken token) {
this.token = token;
this.groupArtifact = null;
}
@@ -95,7 +95,7 @@ public class OseeGroup {
}
}
- private Artifact getOrCreateGroupArtifact(IArtifactToken token) throws OseeCoreException {
+ private Artifact getOrCreateGroupArtifact(ArtifactToken token) throws OseeCoreException {
Artifact groupArtifact = ArtifactQuery.checkArtifactFromId(token.getUuid().intValue(), COMMON, EXCLUDE_DELETED);
if (groupArtifact == null) {
Artifact userGroupsFolder = getOrCreateUserGroupsFolder(COMMON);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeSystemArtifacts.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeSystemArtifacts.java
index ec116078d9..2f4c1eb4f7 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeSystemArtifacts.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeSystemArtifacts.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core;
import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTokens;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
@@ -52,7 +52,7 @@ public final class OseeSystemArtifacts {
return getOrCreateCachedArtifact(artifactType, artifactName, branch, null, true);
}
- public static Artifact getOrCreateArtifact(IArtifactToken artifactToken, BranchId branch) throws OseeCoreException {
+ public static Artifact getOrCreateArtifact(ArtifactToken artifactToken, BranchId branch) throws OseeCoreException {
return getOrCreateCachedArtifact(artifactToken.getArtifactType(), artifactToken.getName(), branch,
artifactToken.getGuid(), artifactToken.getUuid(), true);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/SystemGroup.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/SystemGroup.java
index 0bfc6df9d8..8d2784960a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/SystemGroup.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/SystemGroup.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.enums.CoreArtifactTokens;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -26,7 +26,7 @@ public enum SystemGroup {
private final OseeGroup group;
- SystemGroup(IArtifactToken token) {
+ SystemGroup(ArtifactToken token) {
group = new OseeGroup(token);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
index 064e6be55f..b61e24a15d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
import org.eclipse.osee.framework.core.data.Adaptable;
import org.eclipse.osee.framework.core.data.ArtifactTypeId;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IOseeBranch;
@@ -1579,8 +1579,8 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
}
return result;
}
- if (obj instanceof IArtifactToken) {
- IArtifactToken token = (IArtifactToken) obj;
+ if (obj instanceof ArtifactToken) {
+ ArtifactToken token = (ArtifactToken) obj;
return getGuid().equals(token.getGuid());
}
return false;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java
index 4f0f92f44f..d038817cba 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Set;
import org.eclipse.osee.framework.core.data.ArtifactTypeId;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.OrcsTypesData;
@@ -169,7 +169,7 @@ public class ArtifactTypeManager {
return getFactory(artifactType).makeNewArtifact(branch, artifactType, name, guid, uuid);
}
- public static Artifact addArtifact(IArtifactToken artifactToken, BranchId branch) throws OseeCoreException {
+ public static Artifact addArtifact(ArtifactToken artifactToken, BranchId branch) throws OseeCoreException {
return addArtifact(artifactToken.getArtifactType(), branch, artifactToken.getName(), artifactToken.getGuid(),
artifactToken.getUuid());
}
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 9549715d21..9702e8a6df 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
@@ -30,8 +30,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import org.eclipse.osee.framework.core.data.ArtifactId;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationType;
@@ -78,7 +78,7 @@ public class ArtifactQuery {
private static Map<String, Long> guidToUuid;
private static Map<Long, String> uuidToGuid;
- public static Artifact getArtifactFromToken(IArtifactToken artifactToken, BranchId branch) throws OseeCoreException {
+ public static Artifact getArtifactFromToken(ArtifactToken artifactToken, BranchId branch) throws OseeCoreException {
return getArtifactFromId(artifactToken.getUuid(), branch);
}
@@ -260,9 +260,9 @@ public class ArtifactQuery {
options).getOrCheckArtifact(QueryType.CHECK);
}
- public static List<Artifact> getArtifactListFromTokens(Collection<IArtifactToken> tokens, BranchId branch) {
+ public static List<Artifact> getArtifactListFromTokens(Collection<ArtifactToken> tokens, BranchId branch) {
List<Integer> ids = new LinkedList<>();
- for (IArtifactToken token : tokens) {
+ for (ArtifactToken token : tokens) {
ids.add(token.getId().intValue());
}
return getArtifactListFromIds(ids, branch);
@@ -587,20 +587,20 @@ public class ArtifactQuery {
return artifact;
}
- public static Collection<? extends Artifact> reloadArtifacts(Collection<? extends IArtifactToken> artifacts) throws OseeCoreException {
+ public static Collection<? extends Artifact> reloadArtifacts(Collection<? extends ArtifactToken> artifacts) throws OseeCoreException {
Collection<Artifact> reloadedArts = new ArrayList<>(artifacts.size());
- HashCollection<BranchId, IArtifactToken> branchMap = new HashCollection<>();
+ HashCollection<BranchId, ArtifactToken> branchMap = new HashCollection<>();
if (artifacts.isEmpty()) {
return reloadedArts;
}
- for (IArtifactToken artifact : artifacts) {
+ for (ArtifactToken artifact : artifacts) {
// separate/group artifacts by branch since ArtifactQueryBuilder only supports a single branch
branchMap.put(artifact.getBranch(), artifact);
}
Set<Integer> artIds = new HashSet<>();
- for (Entry<BranchId, Collection<IArtifactToken>> entrySet : branchMap.entrySet()) {
+ for (Entry<BranchId, Collection<ArtifactToken>> entrySet : branchMap.entrySet()) {
- for (IArtifactToken artifact : entrySet.getValue()) {
+ for (ArtifactToken artifact : entrySet.getValue()) {
artIds.add(artifact.getUuid().intValue());
}
@@ -788,23 +788,23 @@ public class ArtifactQuery {
* performing queries.
*/
- public static Collection<IArtifactToken> getArtifactTokenListFromTypeAndActive(IArtifactType artifactType, BranchId branch) {
+ public static Collection<ArtifactToken> getArtifactTokenListFromTypeAndActive(IArtifactType artifactType, BranchId branch) {
JdbcStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(getTokenQuery(Active.Active), artifactType.getId(), branch.getId(), branch.getId(),
branch.getId());
- List<IArtifactToken> tokens = extractTokensFromQuery(chStmt);
+ List<ArtifactToken> tokens = extractTokensFromQuery(chStmt);
return tokens;
} finally {
chStmt.close();
}
}
- public static Collection<IArtifactToken> getArtifactTokenListFromType(IArtifactType artifactType, BranchId branch) {
+ public static Collection<ArtifactToken> getArtifactTokenListFromType(IArtifactType artifactType, BranchId branch) {
JdbcStatement chStmt = ConnectionHandler.getStatement();
try {
chStmt.runPreparedQuery(getTokenQuery(Active.Both), artifactType.getId(), branch.getId(), branch.getId());
- List<IArtifactToken> tokens = extractTokensFromQuery(chStmt);
+ List<ArtifactToken> tokens = extractTokensFromQuery(chStmt);
return tokens;
} finally {
chStmt.close();
@@ -821,14 +821,14 @@ public class ArtifactQuery {
}
}
- private static List<IArtifactToken> extractTokensFromQuery(JdbcStatement chStmt) {
- List<IArtifactToken> tokens = new LinkedList<>();
+ private static List<ArtifactToken> extractTokensFromQuery(JdbcStatement chStmt) {
+ List<ArtifactToken> tokens = new LinkedList<>();
while (chStmt.next()) {
Integer artId = chStmt.getInt("art_id");
Long artTypeId = chStmt.getLong("art_type_id");
String name = chStmt.getString("value");
String guid = chStmt.getString("guid");
- IArtifactToken token =
+ ArtifactToken token =
TokenFactory.createArtifactToken(artId, guid, name, ArtifactTypeManager.getTypeByGuid(artTypeId));
tokens.add(token);
}
@@ -852,7 +852,7 @@ public class ArtifactQuery {
"and txsAttr.BRANCH_ID = ? and attr.GAMMA_ID = txsAttr.GAMMA_ID and txsAttr.TX_CURRENT = 1 " + //
"and art.ART_ID = attr.art_id and attr.ATTR_TYPE_ID = ? and value = ? ";
- public static List<IArtifactToken> getArtifactTokenListFromSoleAttributeInherited(IArtifactType artifactType, IAttributeType attributetype, String value, BranchId branch) {
+ public static List<ArtifactToken> getArtifactTokenListFromSoleAttributeInherited(IArtifactType artifactType, IAttributeType attributetype, String value, BranchId branch) {
ArtifactType artifactTypeFull = ArtifactTypeManager.getType(artifactType);
List<Long> artTypeIds = new LinkedList<>();
@@ -868,7 +868,7 @@ public class ArtifactQuery {
try {
String query = attributeTokenQuery.replaceFirst("ART_IDS_HERE", ids);
chStmt.runPreparedQuery(query, branch.getId(), branch.getId(), attributetype.getId(), value);
- List<IArtifactToken> tokens = extractTokensFromQuery(chStmt);
+ List<ArtifactToken> tokens = extractTokensFromQuery(chStmt);
return tokens;
} finally {
chStmt.close();
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java
index e32b507c82..476c0f806d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.Assert;
import org.eclipse.osee.activity.api.Activity;
import org.eclipse.osee.activity.api.ActivityLog;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -170,7 +170,7 @@ public final class OseeEventManager {
}
// Kick LOCAL transaction event
- public static void kickLocalArtifactReloadEvent(Object source, Collection<? extends IArtifactToken> artifacts) throws OseeCoreException {
+ public static void kickLocalArtifactReloadEvent(Object source, Collection<? extends ArtifactToken> artifacts) throws OseeCoreException {
if (isDisableEvents()) {
return;
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/AccessTopicEventPayload.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/AccessTopicEventPayload.java
index e30f021331..3cadd62289 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/AccessTopicEventPayload.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/AccessTopicEventPayload.java
@@ -16,7 +16,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.ser.std.ToStringSerializer;
import org.eclipse.osee.framework.core.data.ArtifactId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
/**
* Payload for the Access Topic Event
@@ -61,7 +61,7 @@ public class AccessTopicEventPayload implements ISerializeableTopicPayload {
/**
* @return true if this artifact matches event branch and contains artifact
*/
- public boolean matches(IArtifactToken artifact) {
+ public boolean matches(ArtifactToken artifact) {
if (!artifactUuids.isEmpty()) {
return artifact.getBranchId().equals(branchUuid) && artifactUuids.contains(String.valueOf(artifact.getUuid()));
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifact.java
index 35b716ae3e..676cc3e14c 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifact.java
@@ -14,7 +14,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidArtifact;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -36,7 +36,7 @@ public class EventBasicGuidArtifact extends DefaultBasicGuidArtifact {
this(eventModType, artifact.getBranch(), artifact.getArtifactType().getGuid(), artifact.getGuid());
}
- public EventBasicGuidArtifact(EventModType eventModType, IArtifactToken basicGuidArtifact) {
+ public EventBasicGuidArtifact(EventModType eventModType, ArtifactToken basicGuidArtifact) {
this(eventModType, basicGuidArtifact.getBranch(), basicGuidArtifact.getArtifactType().getGuid(),
basicGuidArtifact.getGuid());
}
@@ -50,12 +50,12 @@ public class EventBasicGuidArtifact extends DefaultBasicGuidArtifact {
return eventModType;
}
- public static Set<EventBasicGuidArtifact> get(EventModType eventModType, Collection<? extends IArtifactToken> basicGuidArtifacts) {
+ public static Set<EventBasicGuidArtifact> get(EventModType eventModType, Collection<? extends ArtifactToken> basicGuidArtifacts) {
if (eventModType == EventModType.ChangeType) {
throw new OseeArgumentException("Can't be used for ChangeType");
}
Set<EventBasicGuidArtifact> eventArts = new HashSet<>();
- for (IArtifactToken guidArt : basicGuidArtifacts) {
+ for (ArtifactToken guidArt : basicGuidArtifacts) {
eventArts.add(new EventBasicGuidArtifact(eventModType, guidArt));
}
return eventArts;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/users/UserDataLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/users/UserDataLoader.java
index 08d1d84087..fff850f0a1 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/users/UserDataLoader.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/users/UserDataLoader.java
@@ -16,7 +16,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.eclipse.osee.cache.admin.CacheDataLoader;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreBranches;
@@ -67,7 +67,7 @@ public class UserDataLoader implements CacheDataLoader<String, User> {
@Override
public User reload(String key, User oldValue) throws OseeCoreException {
Collection<? extends Artifact> reloadArtifacts = ArtifactQuery.reloadArtifacts(Collections.singleton(oldValue));
- IArtifactToken artifact = reloadArtifacts.isEmpty() ? null : reloadArtifacts.iterator().next();
+ ArtifactToken artifact = reloadArtifacts.isEmpty() ? null : reloadArtifacts.iterator().next();
return (User) artifact;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/ViewApplicabilityUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/ViewApplicabilityUtil.java
index eeb0936f27..89dd5acd45 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/ViewApplicabilityUtil.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/ViewApplicabilityUtil.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.window.Window;
import org.eclipse.osee.framework.core.data.ApplicabilityId;
import org.eclipse.osee.framework.core.data.ApplicabilityToken;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.model.access.PermissionStatus;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -38,7 +38,7 @@ public class ViewApplicabilityUtil {
public static String CHANGE_APPLICABILITY_INVAILD = "User does not have permissions to change View Applicability";
private static AccessPolicy policy;
- public static boolean changeApplicability(List<? extends IArtifactToken> artifacts) {
+ public static boolean changeApplicability(List<? extends ArtifactToken> artifacts) {
BranchId branch = artifacts.iterator().next().getBranch();
ApplicabilityEndpoint applEndpoint = ServiceUtil.getOseeClient().getApplicabilityEndpoint(branch);
Iterable<ApplicabilityToken> applicabilityTokens = applEndpoint.getApplicabilityTokens();
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/OAuthTypes.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/OAuthTypes.java
index 88e30e83ac..513a4f3521 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/OAuthTypes.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/OAuthTypes.java
@@ -10,7 +10,8 @@
*******************************************************************************/
package org.eclipse.osee.orcs.account.admin.internal.oauth;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.TokenFactory;
@@ -39,7 +40,7 @@ public final class OAuthTypes {
public static final IAttributeType OAUTH_CLIENT_AUTHORIZED_SCOPE = TokenFactory.createAttributeType(0x315964489A850F7AL, "Authorized Scope");
public static final IAttributeType OAUTH_CLIENT_AUTHORIZED_AUDIENCE = TokenFactory.createAttributeType(0x635EBFA0D4A82E22L, "Authorized Audience");
- public static final IArtifactToken OAUTH_TYPES = TokenFactory.createArtifactToken(7067755L, "OAuthTypes", CoreArtifactTypes.OseeTypeDefinition);
+ public static final ArtifactToken OAUTH_TYPES = ArtifactToken.valueOf(7067755, "OAuthTypes", COMMON, CoreArtifactTypes.OseeTypeDefinition);
// @formatter:on
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java
index b7f8efa2ce..cff86ef080 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java
@@ -18,7 +18,7 @@ import org.eclipse.osee.framework.core.data.ApplicabilityId;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.AttributeId;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationSorterId;
@@ -103,7 +103,7 @@ public class TransactionBuilderImpl implements TransactionBuilder {
}
@Override
- public ArtifactId createArtifact(IArtifactToken token) throws OseeCoreException {
+ public ArtifactId createArtifact(ArtifactToken token) throws OseeCoreException {
Conditions.checkExpressionFailOnTrue(token.isInvalid(), "Invalid Id %d. Must be > 0", token.getId());
return txManager.createArtifact(txData, token.getArtifactType(), token.getName(), token.getGuid(), token.getId());
}
diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java
index 8f1893ba74..7ca2d8a395 100644
--- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java
+++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.rest.client;
import java.util.Collection;
import java.util.List;
import org.eclipse.osee.framework.core.data.ArtifactId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationType;
@@ -73,12 +73,12 @@ public interface QueryBuilder {
/**
* Artifacts matching token id(s)
*/
- QueryBuilder andIds(IArtifactToken... artifactToken) throws OseeCoreException;
+ QueryBuilder andIds(ArtifactToken... artifactToken) throws OseeCoreException;
/**
* Artifacts matching token id(s)
*/
- QueryBuilder andIds(Collection<? extends IArtifactToken> artifactTokens) throws OseeCoreException;
+ QueryBuilder andIds(Collection<? extends ArtifactToken> artifactTokens) throws OseeCoreException;
/**
* Search criteria that finds a given artifact type using type inheritance
diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryBuilderImpl.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryBuilderImpl.java
index c2d90471c3..c37a9f6a1e 100644
--- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryBuilderImpl.java
+++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryBuilderImpl.java
@@ -16,7 +16,7 @@ import java.util.Collections;
import java.util.List;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationType;
@@ -115,12 +115,12 @@ public class QueryBuilderImpl implements QueryBuilder {
}
@Override
- public QueryBuilder andIds(IArtifactToken... artifactToken) {
+ public QueryBuilder andIds(ArtifactToken... artifactToken) {
return andIds(Arrays.asList(artifactToken));
}
@Override
- public QueryBuilder andIds(Collection<? extends IArtifactToken> artifactTokens) {
+ public QueryBuilder andIds(Collection<? extends ArtifactToken> artifactTokens) {
predicates.add(predicateFactory.createIdSearch(artifactTokens));
return this;
}
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java
index 5782d8ff65..5319f440ae 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.rest.internal.writer;
/**
* Donald G. Dunne
*/
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IOseeBranch;
@@ -49,7 +49,7 @@ public class OwFactory {
return type;
}
- public static OwArtifactToken createArtifactToken(IArtifactToken token) {
+ public static OwArtifactToken createArtifactToken(ArtifactToken token) {
return createArtifactToken(token.getName(), token.getUuid());
}
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java
index a86b4a7b3a..4c59542f20 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java
@@ -16,7 +16,7 @@ import org.eclipse.osee.framework.core.data.ApplicabilityId;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.AttributeId;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationSorterId;
@@ -56,7 +56,7 @@ public interface TransactionBuilder {
ArtifactId createArtifact(IArtifactType artifactType, String name, String guid, long uuid) throws OseeCoreException;
- ArtifactId createArtifact(IArtifactToken configsFolder);
+ ArtifactId createArtifact(ArtifactToken configsFolder);
void deleteArtifact(ArtifactId sourceArtifact) throws OseeCoreException;

Back to the top