feature[ats_8G0FW]: Remove HRIDs as an ID

Change-Id: I9cfa206f250840760f9a13691e2a48b34321eed2

9 files changed, 33 insertions, 37 deletions

diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenChangeReportByIdActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenChangeReportByIdActionTest.java
index 24cb57655a9..29ec8dd6c48 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenChangeReportByIdActionTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenChangeReportByIdActionTest.java
@@ -31,7 +31,7 @@ public class OpenChangeReportByIdActionTest extends AbstractAtsActionRunTest {
       Assert.assertTrue(result.getText(), result.isTrue());
 
       OpenChangeReportByIdAction action = new OpenChangeReportByIdAction();
-      action.setOverrideId(AtsTestUtil.getTeamWf().getHumanReadableId());
+      action.setOverrideId(AtsTestUtil.getTeamWf().getAtsId());
       action.setPend(true);
       return action;
    }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenWorkflowByIdActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenWorkflowByIdActionTest.java
index 28bd97a8fe6..7e3ba5525a1 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenWorkflowByIdActionTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenWorkflowByIdActionTest.java
@@ -24,7 +24,7 @@ public class OpenWorkflowByIdActionTest extends AbstractAtsActionRunTest {
    public Action createAction() throws OseeCoreException {
       OpenWorkflowByIdAction action = new OpenWorkflowByIdAction();
       action.setPend(true);
-      action.setOverrideId(AtsTestUtil.getTeamWf().getHumanReadableId());
+      action.setOverrideId(AtsTestUtil.getTeamWf().getAtsId());
       return action;
    }
 
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenWorldByIdActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenWorldByIdActionTest.java
index 082e5d9908b..98a3e9cbb7a 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenWorldByIdActionTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenWorldByIdActionTest.java
@@ -22,7 +22,7 @@ public class OpenWorldByIdActionTest extends AbstractAtsActionRunTest {
    @Override
    public OpenWorldByIdAction createAction() throws OseeCoreException {
       OpenWorldByIdAction action = new OpenWorldByIdAction();
-      action.setOverrideIdString(AtsTestUtil.getTeamWf().getHumanReadableId());
+      action.setOverrideIdString(AtsTestUtil.getTeamWf().getAtsId());
       action.setPend(true);
       return action;
    }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/ParentStateAndIdColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/ParentStateAndIdColumnTest.java
index 3c7f8d5408e..5e048d52f2f 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/ParentStateAndIdColumnTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/ParentStateAndIdColumnTest.java
@@ -13,19 +13,19 @@ package org.eclipse.osee.ats.client.integration.tests.ats.column;
 import org.eclipse.osee.ats.api.data.AtsRelationTypes;
 import org.eclipse.osee.ats.client.demo.DemoWorkType;
 import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil;
-import org.eclipse.osee.ats.column.ParentHridColumn;
+import org.eclipse.osee.ats.column.ParentAtsIdColumn;
 import org.eclipse.osee.ats.column.ParentStateColumn;
+import org.eclipse.osee.ats.core.client.action.ActionArtifact;
 import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact;
 import org.eclipse.osee.ats.core.client.team.TeamState;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.support.test.util.TestUtil;
 import org.junit.Assert;
 
 /**
  * @tests ParentStateColumn
- * @tests ParentHridColumn
+ * @tests ParentAtsIdColumn
  * @author Donald G. Dunne
  */
 public class ParentStateAndIdColumnTest {
@@ -36,21 +36,22 @@ public class ParentStateAndIdColumnTest {
 
       TeamWorkFlowArtifact codeArt =
          (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code);
-      Artifact actionArt = codeArt.getParentActionArtifact();
+      ActionArtifact actionArt = codeArt.getParentActionArtifact();
 
-      Assert.assertEquals("", ParentStateColumn.getInstance().getColumnText(codeArt, ParentHridColumn.getInstance(), 0));
-      Assert.assertEquals(actionArt.getHumanReadableId(),
-         ParentHridColumn.getInstance().getColumnText(codeArt, ParentHridColumn.getInstance(), 0));
+      Assert.assertEquals("",
+         ParentStateColumn.getInstance().getColumnText(codeArt, ParentAtsIdColumn.getInstance(), 0));
+      Assert.assertEquals(actionArt.getAtsId(),
+         ParentAtsIdColumn.getInstance().getColumnText(codeArt, ParentAtsIdColumn.getInstance(), 0));
 
       PeerToPeerReviewArtifact peerArt =
          (PeerToPeerReviewArtifact) codeArt.getRelatedArtifact(AtsRelationTypes.TeamWorkflowToReview_Review);
       Assert.assertEquals(TeamState.Implement.getName(),
-         ParentStateColumn.getInstance().getColumnText(peerArt, ParentHridColumn.getInstance(), 0));
-      Assert.assertEquals(codeArt.getHumanReadableId(),
-         ParentHridColumn.getInstance().getColumnText(peerArt, ParentHridColumn.getInstance(), 0));
+         ParentStateColumn.getInstance().getColumnText(peerArt, ParentAtsIdColumn.getInstance(), 0));
+      Assert.assertEquals(codeArt.getAtsId(),
+         ParentAtsIdColumn.getInstance().getColumnText(peerArt, ParentAtsIdColumn.getInstance(), 0));
 
       Assert.assertEquals("",
-         ParentStateColumn.getInstance().getColumnText(actionArt, ParentHridColumn.getInstance(), 0));
+         ParentStateColumn.getInstance().getColumnText(actionArt, ParentAtsIdColumn.getInstance(), 0));
 
       TestUtil.severeLoggingEnd(loggingMonitor);
    }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java
index 2e26cef0cf6..85892daa89c 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java
@@ -133,13 +133,13 @@ public class AtsBranchConfigurationTest {
       }
       IAtsTeamDefinition teamDef = operation.getTeamDefinition();
       IAtsVersion versionToTarget = null;
-      String version1Hrid = "", version2Hrid = "";
+      String version1Guid = "", version2Guid = "";
       for (IAtsVersion vArt : teamDef.getVersions()) {
          if (vArt.getName().contains("Ver1")) {
             versionToTarget = vArt;
-            version1Hrid = vArt.getHumanReadableId();
+            version1Guid = vArt.getGuid();
          } else {
-            version2Hrid = vArt.getHumanReadableId();
+            version2Guid = vArt.getGuid();
          }
       }
       versionToTarget.setBaselineBranchGuid(viaTeamDefBranch.getGuid());
@@ -180,8 +180,7 @@ public class AtsBranchConfigurationTest {
          OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Transitioning to Implement state");
       }
 
-      dtwm.transitionTo(TeamState.Implement, AtsClientService.get().getUserAdmin().getCurrentUser(), false,
-         transaction);
+      dtwm.transitionTo(TeamState.Implement, AtsClientService.get().getUserAdmin().getCurrentUser(), false, transaction);
       teamWf.persist("Branch Configuration Test");
 
       SMAEditor.editArtifact(teamWf);
@@ -216,8 +215,8 @@ public class AtsBranchConfigurationTest {
       assertTrue("Should be 1 new artifact in change report, found " + newArts.size(), newArts.size() == 1);
 
       TestUtil.severeLoggingEnd(monitor, Arrays.asList(
-         "Version [[" + version1Hrid + "][BranchViaVersions - Ver1]] has no related team defininition",
-         "Version [[" + version2Hrid + "][BranchViaVersions - Ver2]] has no related team defininition"));
+         "Version [[" + version1Guid + "][BranchViaVersions - Ver1]] has no related team defininition",
+         "Version [[" + version2Guid + "][BranchViaVersions - Ver2]] has no related team defininition"));
    }
 
    @org.junit.Test
@@ -293,8 +292,7 @@ public class AtsBranchConfigurationTest {
       if (DEBUG) {
          OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Transitioning to Implement state");
       }
-      dtwm.transitionTo(TeamState.Implement, AtsClientService.get().getUserAdmin().getCurrentUser(), false,
-         transaction);
+      dtwm.transitionTo(TeamState.Implement, AtsClientService.get().getUserAdmin().getCurrentUser(), false, transaction);
       teamWf.persist("Test branch via team definition: Transition to desired state");
 
       // create branch
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java
index 9d97a4183c8..03696745b45 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java
@@ -66,7 +66,6 @@ import org.eclipse.osee.framework.core.exception.OseeWrappedException;
 import org.eclipse.osee.framework.core.operation.Operations;
 import org.eclipse.osee.framework.core.util.Result;
 import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.jdk.core.util.HumanReadableId;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
@@ -330,9 +329,7 @@ public class AtsTestUtil {
       testAi3.setTeamDefinition(teamDef);
       testAi4.setTeamDefinition(teamDef);
 
-      verArt1 =
-         AtsClientService.get().createVersion(getTitle("ver 1.0", postFixName), GUID.create(),
-            HumanReadableId.generate());
+      verArt1 = AtsClientService.get().createVersion(getTitle("ver 1.0", postFixName), GUID.create());
       teamDef.getVersions().add(verArt1);
 
       verArt2 = AtsClientService.get().createVersion(getTitle("ver 2.0", postFixName));
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/CopyActionDetailsTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/CopyActionDetailsTest.java
index b9e313606d1..222bd69fff3 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/CopyActionDetailsTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/CopyActionDetailsTest.java
@@ -41,7 +41,7 @@ public class CopyActionDetailsTest {
       AtsTestUtil.cleanupAndReset(getClass().getSimpleName());
       String str = new CopyActionDetails(AtsTestUtil.getTeamWf()).getDetailsString();
       assertEquals(
-         "\"Team Workflow\" - " + AtsTestUtil.getTeamWf().getHumanReadableId() + " - \"AtsTestUtil - Team WF [CopyActionDetailsTest]\"",
+         "\"Team Workflow\" - " + AtsTestUtil.getTeamWf().getAtsId() + " - \"AtsTestUtil - Team WF [CopyActionDetailsTest]\"",
          str);
    }
 
@@ -49,7 +49,7 @@ public class CopyActionDetailsTest {
    public void test02GetDetailsStringForTask() throws OseeCoreException {
       String str = new CopyActionDetails(AtsTestUtil.getOrCreateTaskOffTeamWf1()).getDetailsString();
       assertEquals(
-         "\"Task\" - " + AtsTestUtil.getOrCreateTaskOffTeamWf1().getHumanReadableId() + " - \"AtsTestUtil - Task [CopyActionDetailsTest]\"",
+         "\"Task\" - " + AtsTestUtil.getOrCreateTaskOffTeamWf1().getAtsId() + " - \"AtsTestUtil - Task [CopyActionDetailsTest]\"",
          str);
    }
 
@@ -58,7 +58,7 @@ public class CopyActionDetailsTest {
       DecisionReviewArtifact review =
          AtsTestUtil.getOrCreateDecisionReview(ReviewBlockType.Commit, AtsTestUtilState.Analyze);
       String str = new CopyActionDetails(review).getDetailsString();
-      assertEquals("\"Decision Review\" - " + review.getHumanReadableId() + " - \"AtsTestUtil Test Decision Review\"",
+      assertEquals("\"Decision Review\" - " + review.getAtsId() + " - \"AtsTestUtil Test Decision Review\"",
          str);
       review.persist(getClass().getSimpleName());
    }
@@ -68,7 +68,7 @@ public class CopyActionDetailsTest {
       PeerToPeerReviewArtifact review =
          AtsTestUtil.getOrCreatePeerReview(ReviewBlockType.None, AtsTestUtilState.Analyze, null);
       String str = new CopyActionDetails(review).getDetailsString();
-      assertEquals("\"PeerToPeer Review\" - " + review.getHumanReadableId() + " - \"AtsTestUtil Test Peer Review\"",
+      assertEquals("\"PeerToPeer Review\" - " + review.getAtsId() + " - \"AtsTestUtil Test Peer Review\"",
          str);
       review.persist(getClass().getSimpleName());
    }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/render/RendererManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/render/RendererManagerTest.java
index 956cd052c56..a5b86dba068 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/render/RendererManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/render/RendererManagerTest.java
@@ -81,7 +81,7 @@ public class RendererManagerTest {
 
    @Test
    public void testGetBestRenderer() throws OseeCoreException {
-      Artifact artifact = new Artifact(GUID.create(), null, BranchManager.getCommonBranch(), artifactType);
+      Artifact artifact = new Artifact(GUID.create(), BranchManager.getCommonBranch(), artifactType);
 
       if (defaultOption == Both) {
          testGetBestRendererWithOption(artifact, On);
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/SMAPromptChangeStatusTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/SMAPromptChangeStatusTest.java
index 897ef3749b9..a350afdf958 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/SMAPromptChangeStatusTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/SMAPromptChangeStatusTest.java
@@ -177,23 +177,23 @@ public class SMAPromptChangeStatusTest {
 
    private static void validateSMAs(Collection<? extends AbstractWorkflowArtifact> awas, String stateName, int totalPercent, double hoursSpent) throws Exception {
       for (AbstractWorkflowArtifact awa : awas) {
-         assertEquals("Current State wrong for " + awa.getHumanReadableId(), awa.getStateMgr().getCurrentStateName(),
+         assertEquals("Current State wrong for " + awa.getAtsId(), awa.getStateMgr().getCurrentStateName(),
             stateName);
          if (awa.isCompletedOrCancelled()) {
-            assertEquals("ats.CurrentState wrong " + awa.getHumanReadableId(),
+            assertEquals("ats.CurrentState wrong " + awa.getAtsId(),
                awa.getStateMgr().getCurrentStateName() + ";;;",
                awa.getSoleAttributeValue(AtsAttributeTypes.CurrentState));
          }
-         assertEquals("Percent wrong for " + awa.getHumanReadableId(),
+         assertEquals("Percent wrong for " + awa.getAtsId(),
             PercentCompleteTotalUtil.getPercentCompleteTotal(awa), totalPercent);
-         assertEquals("Hours Spent wrong for " + awa.getHumanReadableId(), HoursSpentUtil.getHoursSpentTotal(awa),
+         assertEquals("Hours Spent wrong for " + awa.getAtsId(), HoursSpentUtil.getHoursSpentTotal(awa),
             hoursSpent, 0.0);
 
          for (String xml : awa.getAttributesToStringList(AtsAttributeTypes.State)) {
             WorkStateImpl state = AtsWorkStateFactory.getFromXml(xml);
             boolean isCompletedCancelledState = isCompletedCancelledState(awa, state.getName());
             if (isCompletedCancelledState) {
-               assertTrue("completed/cancelled ats.State [" + xml + "] wrong " + awa.getHumanReadableId(),
+               assertTrue("completed/cancelled ats.State [" + xml + "] wrong " + awa.getAtsId(),
                   xml.endsWith(";;;"));
             }
          }