feature[ats_6J9RS]: Convert ATS config to use artifact tokens

Change-Id: Ibf7116b8877335f00694bee90c5ce7fb452494ba

6 files changed, 128 insertions, 43 deletions

diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoArtifactToken.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoArtifactToken.java
new file mode 100644
index 00000000000..59bf8181c0e
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoArtifactToken.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.ats.client.demo;
+
+import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
+import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.TokenFactory;
+import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
+
+/**
+ * @author Donald G. Dunne
+ */
+public final class DemoArtifactToken {
+
+   public static IArtifactToken Process_Team = TokenFactory.createArtifactToken("At2WHxBtYhx4Nxrck6gA", "Process_Team",
+      CoreArtifactTypes.Folder);
+   public static IArtifactToken Tools_Team = TokenFactory.createArtifactToken("At2WHxCFyQPidx78iuAA", "Tools_Team",
+      CoreArtifactTypes.Folder);
+
+   public static IArtifactToken SAW_HW = TokenFactory.createArtifactToken("At2WHxCeMCHfcr02EkAA", "SAW_HW",
+      CoreArtifactTypes.Folder);
+   public static IArtifactToken SAW_Code = TokenFactory.createArtifactToken("At2WHxC2lxLOGB0YiuQA", "SAW_Code",
+      CoreArtifactTypes.Folder);
+   public static IArtifactToken SAW_Test = TokenFactory.createArtifactToken("At2WHxDuXkCIJFEtQ0AA", "SAW_Test",
+      CoreArtifactTypes.Folder);
+   public static IArtifactToken SAW_SW_Design = TokenFactory.createArtifactToken("At2WHxEGxl7nWuqx7FQA",
+      "SAW_SW_Design", CoreArtifactTypes.Folder);
+   public static IArtifactToken SAW_Requirements = TokenFactory.createArtifactToken("At2WHxEfLXfCLytmLlAA",
+      "SAW_Requirements", CoreArtifactTypes.Folder);
+   public static IArtifactToken SAW_SW = TokenFactory.createArtifactToken("At2WHxFk5VVE2cafF5AA", "SAW_SW",
+      CoreArtifactTypes.Folder);
+
+   // SAW_SW Versions
+   public static IArtifactToken SAW_Bld_1 = TokenFactory.createArtifactToken("A8msa8LTDG36oWAnq3QA", "SAW_Bld_1",
+      AtsArtifactTypes.Version);
+   public static IArtifactToken SAW_Bld_2 = TokenFactory.createArtifactToken("A8YqcqyKh3HCkcHfEVwA", "SAW_Bld_2",
+      AtsArtifactTypes.Version);
+   public static IArtifactToken SAW_Bld_3 = TokenFactory.createArtifactToken("A8msa8LrcxhyrUTsbuwA", "SAW_Bld_3",
+      AtsArtifactTypes.Version);
+
+   public static IArtifactToken CIS_SW = TokenFactory.createArtifactToken("At2WHxF7jmUa8jXR3iwA", "CIS_SW",
+      CoreArtifactTypes.Folder);
+   public static IArtifactToken CIS_Code = TokenFactory.createArtifactToken("At2WHxGo4A1nnGWYjgwA", "CIS_Code",
+      CoreArtifactTypes.Folder);
+   public static IArtifactToken CIS_Test = TokenFactory.createArtifactToken("At2WHxHZrl0bKPA6uUgA", "CIS_Test",
+      CoreArtifactTypes.Folder);
+
+   public static IArtifactToken Facilities_Team = TokenFactory.createArtifactToken("At2WHxIMOz66yR56eRAA",
+      "Facilities_Team", CoreArtifactTypes.Folder);
+
+   private DemoArtifactToken() {
+      // Constants
+   }
+}
diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoTeam.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoTeam.java
index c2304c4c0c1..3410704dc89 100644
--- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoTeam.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoTeam.java
@@ -10,22 +10,34 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.client.demo;
 
+import org.eclipse.osee.framework.core.data.IArtifactToken;
+
 /**
  * Convenience method for demo plugin to retrieve configured teams for use mostly in DemoNavigateViewItem.
  * 
  * @author Donald G. Dunne
  */
 public enum DemoTeam {
-   Process_Team,
-   Tools_Team,
-   SAW_HW,
-   SAW_Code,
-   SAW_Test,
-   SAW_SW_Design,
-   SAW_Requirements,
-   SAW_SW,
-   CIS_SW,
-   CIS_Code,
-   CIS_Test,
-   Facilities_Team
+   Process_Team(DemoArtifactToken.Process_Team),
+   Tools_Team(DemoArtifactToken.Tools_Team),
+   SAW_HW(DemoArtifactToken.SAW_HW),
+   SAW_Code(DemoArtifactToken.SAW_Code),
+   SAW_Test(DemoArtifactToken.SAW_Test),
+   SAW_SW_Design(DemoArtifactToken.SAW_SW_Design),
+   SAW_Requirements(DemoArtifactToken.SAW_Requirements),
+   SAW_SW(DemoArtifactToken.SAW_SW),
+   CIS_SW(DemoArtifactToken.CIS_SW),
+   CIS_Code(DemoArtifactToken.CIS_Code),
+   CIS_Test(DemoArtifactToken.CIS_Test),
+   Facilities_Team(DemoArtifactToken.Facilities_Team);
+
+   private final IArtifactToken teamDefToken;
+
+   private DemoTeam(IArtifactToken teamDefToken) {
+      this.teamDefToken = teamDefToken;
+   }
+
+   public IArtifactToken getTeamDefToken() {
+      return teamDefToken;
+   }
 }
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 883cadabb7d..e0bd745d2cc 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
@@ -43,11 +43,11 @@ import org.eclipse.osee.ats.core.client.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.core.client.workflow.ChangeType;
 import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption;
-import org.eclipse.osee.ats.core.config.AtsConfigCache;
 import org.eclipse.osee.ats.core.config.AtsVersionService;
 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.IArtifactType;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.data.IRelationTypeSide;
@@ -61,8 +61,6 @@ import org.eclipse.osee.framework.core.operation.IOperation;
 import org.eclipse.osee.framework.core.operation.Operations;
 import org.eclipse.osee.framework.core.util.Result;
 import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -236,17 +234,15 @@ public class PopulateDemoActions extends XNavigateItemAction {
       if (DEBUG) {
          OseeLog.log(Activator.class, Level.INFO, "createNonReqChangeDemoActions - SAW_Bld_3");
       }
-      List<ActionArtifact> actions =
-         Collections.castAll(createActions(DemoDbActionData.getNonReqSawActionData(),
-            DemoSawBuilds.SAW_Bld_3.toString(), null, transaction));
+      Set<ActionArtifact> actions =
+         createActions(DemoDbActionData.getNonReqSawActionData(), DemoArtifactToken.SAW_Bld_3, null, transaction);
       appendBuildNameToTitles(actions, DemoSawBuilds.SAW_Bld_3.getName(), transaction);
 
       if (DEBUG) {
          OseeLog.log(Activator.class, Level.INFO, "createNonReqChangeDemoActions - SAW_Bld_2");
       }
       actions =
-         Collections.castAll(createActions(DemoDbActionData.getNonReqSawActionData(),
-            DemoSawBuilds.SAW_Bld_2.toString(), null, transaction));
+         createActions(DemoDbActionData.getNonReqSawActionData(), DemoArtifactToken.SAW_Bld_2, null, transaction);
       appendBuildNameToTitles(actions, DemoSawBuilds.SAW_Bld_2.getName(), transaction);
 
       if (DEBUG) {
@@ -254,9 +250,9 @@ public class PopulateDemoActions extends XNavigateItemAction {
       }
 
       actions =
-         Collections.castAll(createActions(DemoDbActionData.getNonReqSawActionData(),
-            DemoSawBuilds.SAW_Bld_1.toString(), TeamState.Completed, transaction));
-      appendBuildNameToTitles(actions, DemoSawBuilds.SAW_Bld_1.getName(), transaction);
+         createActions(DemoDbActionData.getNonReqSawActionData(), DemoArtifactToken.SAW_Bld_1, TeamState.Completed,
+            transaction);
+      appendBuildNameToTitles(actions, DemoSawBuilds.SAW_Bld_1.toString(), transaction);
 
       transaction.execute();
    }
@@ -271,7 +267,7 @@ public class PopulateDemoActions extends XNavigateItemAction {
       transaction.execute();
    }
 
-   private void appendBuildNameToTitles(List<ActionArtifact> actions, String buildName, SkynetTransaction transaction) throws OseeCoreException {
+   private void appendBuildNameToTitles(Set<ActionArtifact> actions, String buildName, SkynetTransaction transaction) throws OseeCoreException {
       for (ActionArtifact action : actions) {
          for (TeamWorkFlowArtifact team : action.getTeams()) {
             team.setName(team.getName() + " for " + buildName);
@@ -282,8 +278,8 @@ public class PopulateDemoActions extends XNavigateItemAction {
       }
    }
 
-   private Set<Artifact> createActions(List<DemoDbActionData> actionDatas, String versionStr, TeamState toStateOverride, SkynetTransaction transaction) throws Exception {
-      Set<Artifact> actionArts = new HashSet<Artifact>();
+   private Set<ActionArtifact> createActions(List<DemoDbActionData> actionDatas, IArtifactToken versionToken, TeamState toStateOverride, SkynetTransaction transaction) throws Exception {
+      Set<ActionArtifact> actionArts = new HashSet<ActionArtifact>();
       int currNum = 1;
       for (DemoDbActionData aData : actionDatas) {
          if (DEBUG) {
@@ -294,7 +290,7 @@ public class PopulateDemoActions extends XNavigateItemAction {
          IAtsUser createdBy = AtsUsersClient.getUser();
 
          for (String prefixTitle : aData.prefixTitles) {
-            Artifact actionArt =
+            ActionArtifact actionArt =
                ActionManager.createAction(null, prefixTitle + " " + aData.postFixTitle,
                   TITLE_PREFIX[x] + " " + aData.postFixTitle, CHANGE_TYPE[x], aData.priority, false, null,
                   aData.getActionableItems(), createdDate, createdBy, null, transaction);
@@ -333,8 +329,8 @@ public class PopulateDemoActions extends XNavigateItemAction {
                }
 
                teamWf.persist(transaction);
-               if (Strings.isValid(versionStr)) {
-                  IAtsVersion version = AtsConfigCache.instance.getSoleByName(versionStr, IAtsVersion.class);
+               if (versionToken != null) {
+                  IAtsVersion version = AtsVersionService.get().getById(versionToken);
                   AtsVersionService.get().setTargetedVersionAndStore(teamWf, version);
                   teamWf.persist(transaction);
                }
diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateSawBuild2Actions.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateSawBuild2Actions.java
index 9e45e6ced25..bd3111a2e96 100644
--- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateSawBuild2Actions.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateSawBuild2Actions.java
@@ -43,6 +43,7 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.util.Conditions;
 import org.eclipse.osee.framework.core.util.Result;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -57,11 +58,15 @@ import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
  */
 public class PopulateSawBuild2Actions {
 
-   private static String versionStr = DemoSawBuilds.SAW_Bld_2.toString();
+   private static IAtsVersion version = null;
    private static TeamState toState = TeamState.Implement;
    private static boolean DEBUG = false;
 
    public static void run() throws OseeCoreException {
+
+      version = AtsVersionService.get().getById(DemoArtifactToken.SAW_Bld_2);
+      Conditions.checkNotNull(version, "SAW_Bld_2");
+
       // Create SAW_Bld_2 Actions
       SkynetTransaction transaction =
          TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Populate Demo DB - PopulateSawBuild2Actions");
@@ -125,7 +130,6 @@ public class PopulateSawBuild2Actions {
 
          teamWf.persist(transaction);
 
-         IAtsVersion version = AtsConfigCache.instance.getSoleByName(versionStr, IAtsVersion.class);
          AtsVersionService.get().setTargetedVersionAndStore(teamWf, version);
          teamWf.persist(transaction);
       }
@@ -201,7 +205,6 @@ public class PopulateSawBuild2Actions {
 
          teamWf.persist(transaction);
 
-         IAtsVersion version = AtsConfigCache.instance.getSoleByName(versionStr, IAtsVersion.class);
          AtsVersionService.get().setTargetedVersionAndStore(teamWf, version);
          teamWf.persist(transaction);
       }
@@ -279,7 +282,6 @@ public class PopulateSawBuild2Actions {
 
          teamWf.persist(transaction);
 
-         IAtsVersion version = AtsConfigCache.instance.getSoleByName(versionStr, IAtsVersion.class);
          AtsVersionService.get().setTargetedVersionAndStore(teamWf, version);
          teamWf.persist(transaction);
       }
@@ -337,7 +339,6 @@ public class PopulateSawBuild2Actions {
          }
 
          teamWf.persist(transaction);
-         IAtsVersion version = AtsConfigCache.instance.getSoleByName(versionStr, IAtsVersion.class);
          AtsVersionService.get().setTargetedVersionAndStore(teamWf, version);
          teamWf.persist(transaction);
       }
diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/DemoNavigateViewItems.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/DemoNavigateViewItems.java
index 017bf06ca0f..45d92195559 100644
--- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/DemoNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/DemoNavigateViewItems.java
@@ -56,17 +56,16 @@ public class DemoNavigateViewItems implements IAtsNavigateItem {
    }
 
    private static IAtsTeamDefinition getTeamDef(DemoTeam team) throws OseeCoreException {
+      IAtsTeamDefinition results = null;
       // Add check to keep exception from occurring for OSEE developers running against production
-      if (ClientSessionManager.isProductionDataStore()) {
-         return null;
-      }
-      try {
-         String name = team.name().replaceAll("_", " ");
-         return AtsConfigCache.instance.getSoleByName(name, IAtsTeamDefinition.class);
-      } catch (Exception ex) {
-         OseeLog.log(Activator.class, Level.SEVERE, ex);
+      if (!ClientSessionManager.isProductionDataStore()) {
+         try {
+            results = AtsConfigCache.instance.getSoleByGuid(team.getTeamDefToken().getGuid(), IAtsTeamDefinition.class);
+         } catch (Exception ex) {
+            OseeLog.log(Activator.class, Level.SEVERE, ex);
+         }
       }
-      return null;
+      return results;
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.ats.client.demo/support/WorkDef_Demo_AIs_And_Team_Definitions.ats b/plugins/org.eclipse.osee.ats.client.demo/support/WorkDef_Demo_AIs_And_Team_Definitions.ats
index 82a157d70a4..7e4e690694e 100644
--- a/plugins/org.eclipse.osee.ats.client.demo/support/WorkDef_Demo_AIs_And_Team_Definitions.ats
+++ b/plugins/org.eclipse.osee.ats.client.demo/support/WorkDef_Demo_AIs_And_Team_Definitions.ats
@@ -27,6 +27,7 @@ teamDefinition "Teams" GetOrCreate {
 	children {
 
 		teamDefinition "CIS SW" {
+			guid "At2WHxF7jmUa8jXR3iwA"
 			staticId "cis.teamDefHoldingVersions"
 			lead named "Kay Jason"
 			member named "Steven Kohn"
@@ -48,6 +49,7 @@ teamDefinition "Teams" GetOrCreate {
 			children {
 
 				teamDefinition "CIS Code" {
+					guid "At2WHxGo4A1nnGWYjgwA"
 					staticId "cis.code"
 					lead named "Jason Michael"
 					member named "Jason Michael"
@@ -69,6 +71,7 @@ teamDefinition "Teams" GetOrCreate {
 				}
 
 				teamDefinition "CIS Test" {
+					guid "At2WHxHZrl0bKPA6uUgA"
 					staticId "cis.test"
 					lead named "Kay Jones"
 					member named "Kay Jones"
@@ -78,6 +81,7 @@ teamDefinition "Teams" GetOrCreate {
 		}
 
 		teamDefinition "Facilities Team" {
+			guid "At2WHxIMOz66yR56eRAA"
 			lead named "John Stevens"
 			member named "John Stevens"
 			member named "Steven Michael"
@@ -98,6 +102,7 @@ teamDefinition "Teams" GetOrCreate {
 		}
 
 		teamDefinition "Process Team" {
+			guid "At2WHxBtYhx4Nxrck6gA"
 			lead named "Alex Kay"
 			member named "Keith Johnson"
 			member named "Michael Alex"
@@ -107,6 +112,7 @@ teamDefinition "Teams" GetOrCreate {
 		}
 
 		teamDefinition "SAW SW" {
+			guid "At2WHxFk5VVE2cafF5AA"
 			staticId "saw.teamDefHoldingVersions"
 			lead named "Kay Jason"
 			member named "Maichael Johnson"
@@ -114,21 +120,25 @@ teamDefinition "Teams" GetOrCreate {
 			member named "Kay Jason"
 			workDefinition "WorkDef_Team_Default"
 			version "SAW_Bld_1" {
+				guid "A8msa8LTDG36oWAnq3QA"
 				staticId "saw.teamDefHoldingVersions"
 				released True
 				baslineBranchGuid "AyH_f2sSKy3l07fIvAAA"
 			}
 			version "SAW_Bld_2" {
+				guid "A8YqcqyKh3HCkcHfEVwA"
 				staticId "saw.teamDefHoldingVersions"
 				next True allowCreateBranch True allowCommitBranch True
 				baslineBranchGuid "AyH_f2sSKy3l07fIvBBB"
 			}
 			version "SAW_Bld_3" {
+				guid "A8msa8LrcxhyrUTsbuwA"
 				staticId "saw.teamDefHoldingVersions"
 			}
 			children {
 
 				teamDefinition "SAW Code" {
+					guid "At2WHxC2lxLOGB0YiuQA"
 					staticId "saw.code"
 					lead named "Joe Smith"
 					member named "Joe Smith"
@@ -136,12 +146,14 @@ teamDefinition "Teams" GetOrCreate {
 				}
 
 				teamDefinition "SAW HW" {
+					guid "At2WHxCeMCHfcr02EkAA"
 					lead named "Jason Michael"
 					member named "Jason Michael"
 					workDefinition "WorkDef_Team_Default"
 				}
 
 				teamDefinition "SAW Requirements" {
+					guid "At2WHxEfLXfCLytmLlAA"
 					staticId "saw.requirements"
 					lead named "Joe Smith"
 					member named "Joe Smith"
@@ -149,6 +161,7 @@ teamDefinition "Teams" GetOrCreate {
 				}
 
 				teamDefinition "SAW SW Design" {
+					guid "At2WHxEGxl7nWuqx7FQA"
 					staticId "saw.sw_design"
 					lead named "Kay Jones"
 					member named "Kay Jones"
@@ -156,6 +169,7 @@ teamDefinition "Teams" GetOrCreate {
 				}
 
 				teamDefinition "SAW Test" {
+					guid "At2WHxDuXkCIJFEtQ0AA"
 					staticId "saw.test"
 					lead named "Kay Jones"
 					member named "Kay Jones" privileged named "Joe Smith"
@@ -165,6 +179,7 @@ teamDefinition "Teams" GetOrCreate {
 		}
 
 		teamDefinition "Tools Team" {
+			guid "At2WHxCFyQPidx78iuAA"
 			lead named "Jeffery Kay"
 			member named "Jeffery Kay"
 			member named "Roland Stevens"