refactor: Remove userService.getCurrentUser from ActionFactory

Change-Id: I7dd85cdb7ccb34b9e6db744fb9ccdac333d14599

5 files changed, 26 insertions, 15 deletions

diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/WordUpdateEndpointImplTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/WordUpdateEndpointImplTest.java
index 3cbb0950226..17622487371 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/WordUpdateEndpointImplTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/WordUpdateEndpointImplTest.java
@@ -17,6 +17,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
 import org.eclipse.osee.ats.api.util.IAtsChangeSet;
 import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.ats.client.integration.tests.DirtyArtifactCacheTest;
+import org.eclipse.osee.ats.core.users.AtsCoreUsers;
 import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.define.report.api.WordArtifactChange;
 import org.eclipse.osee.define.report.api.WordUpdateChange;
@@ -53,8 +54,8 @@ public class WordUpdateEndpointImplTest extends AbstractRestTest {
    public static void cleanup() {
       List<Artifact> teamWorkflows = ArtifactQuery.getArtifactListFromTypeAndName(AtsArtifactTypes.TeamWorkflow,
          "Safety", AtsUtilCore.getAtsBranch(), QueryOption.CONTAINS_MATCH_OPTIONS);
-      IAtsChangeSet changes =
-         AtsClientService.get().getStoreService().createAtsChangeSet(WordUpdateEndpointImplTest.class.getSimpleName());
+      IAtsChangeSet changes = AtsClientService.get().getStoreService().createAtsChangeSet(
+         WordUpdateEndpointImplTest.class.getSimpleName(), AtsCoreUsers.SYSTEM_USER);
       for (Artifact teamArt : teamWorkflows) {
          changes.deleteArtifact(teamArt);
       }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsChangeSetTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsChangeSetTest.java
index 3f28b05589f..88f8dd2fc03 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsChangeSetTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsChangeSetTest.java
@@ -84,7 +84,7 @@ public class AtsChangeSetTest {
       Artifact genDocArt3 = getGenDocArt(3);
 
       // setRelations
-      IAtsChangeSet changes = AtsClientService.get().getStoreService().createAtsChangeSet(getClass().getSimpleName());
+      IAtsChangeSet changes = createAtsChangeSet();
       changes.setRelations(folderArt, CoreRelationTypes.Default_Hierarchical__Child,
          Arrays.asList(genDocArt0, genDocArt1, genDocArt2));
       changes.execute();
@@ -95,7 +95,7 @@ public class AtsChangeSetTest {
       Assert.assertTrue(folderArt.getChildren().contains(genDocArt2));
 
       // setRelations - remove one and add one
-      changes = AtsClientService.get().getStoreService().createAtsChangeSet(getClass().getSimpleName());
+      changes = createAtsChangeSet();
       changes.setRelations(folderArt, CoreRelationTypes.Default_Hierarchical__Child,
          Arrays.asList(genDocArt0, genDocArt3, genDocArt2));
       changes.execute();
@@ -107,7 +107,7 @@ public class AtsChangeSetTest {
       Assert.assertTrue(folderArt.getChildren().contains(genDocArt3));
 
       // setRelation - remove one and add one
-      changes = AtsClientService.get().getStoreService().createAtsChangeSet(getClass().getSimpleName());
+      changes = createAtsChangeSet();
       changes.setRelation(folderArt, CoreRelationTypes.Default_Hierarchical__Child, genDocArt2);
       changes.execute();
 
@@ -122,7 +122,7 @@ public class AtsChangeSetTest {
       Artifact genDocArt2 = getGenDocArt(2);
 
       // Relate
-      IAtsChangeSet changes = AtsClientService.get().getStoreService().createAtsChangeSet(getClass().getSimpleName());
+      IAtsChangeSet changes = createAtsChangeSet();
       changes.relate(folderArt, CoreRelationTypes.Default_Hierarchical__Child, genDocArt0);
       changes.execute();
 
@@ -131,7 +131,7 @@ public class AtsChangeSetTest {
       Assert.assertEquals(folderArt, genDocArt0.getParent());
 
       // Add 2 more children
-      changes = AtsClientService.get().getStoreService().createAtsChangeSet(getClass().getSimpleName());
+      changes = createAtsChangeSet();
       changes.relate(folderArt, CoreRelationTypes.Default_Hierarchical__Child, genDocArt1);
       changes.relate(folderArt, CoreRelationTypes.Default_Hierarchical__Child, genDocArt2);
       changes.execute();
@@ -145,7 +145,7 @@ public class AtsChangeSetTest {
       Assert.assertEquals(folderArt, genDocArt2.getParent());
 
       // UnRelate All
-      changes = AtsClientService.get().getStoreService().createAtsChangeSet(getClass().getSimpleName());
+      changes = createAtsChangeSet();
       changes.unrelateAll(folderArt, CoreRelationTypes.Default_Hierarchical__Child);
       changes.execute();
 
@@ -155,7 +155,7 @@ public class AtsChangeSetTest {
       Assert.assertNull(genDocArt2.getParent());
 
       // Relate using opposite side
-      changes = AtsClientService.get().getStoreService().createAtsChangeSet(getClass().getSimpleName());
+      changes = createAtsChangeSet();
       changes.relate(genDocArt0, CoreRelationTypes.Default_Hierarchical__Parent, folderArt);
       changes.execute();
 
@@ -174,7 +174,7 @@ public class AtsChangeSetTest {
          }
       }
 
-      IAtsChangeSet changes = AtsClientService.get().getStoreService().createAtsChangeSet(getClass().getSimpleName());
+      IAtsChangeSet changes = createAtsChangeSet();
       changes.setAttribute(folderArt, staticIdAttr.getId(), "new id");
       changes.execute();
 
@@ -184,7 +184,7 @@ public class AtsChangeSetTest {
 
    @Test
    public void testSetSoleAttributeById() {
-      IAtsChangeSet changes = AtsClientService.get().getStoreService().createAtsChangeSet(getClass().getSimpleName());
+      IAtsChangeSet changes = createAtsChangeSet();
       changes.setSoleAttributeValue(folderArt, CoreAttributeTypes.StaticId, "newest id");
       changes.execute();
 
@@ -192,4 +192,8 @@ public class AtsChangeSetTest {
       Assert.assertEquals("newest id", folderArt.getSoleAttributeValue(CoreAttributeTypes.StaticId, null));
    }
 
+   private IAtsChangeSet createAtsChangeSet() {
+      return AtsClientService.get().getStoreService().createAtsChangeSet(getClass().getSimpleName(),
+         AtsClientService.get().getUserService().getCurrentUser());
+   }
 }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/AtsTaskEndpointImplTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/AtsTaskEndpointImplTest.java
index 74d681ae9a5..0416338aae6 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/AtsTaskEndpointImplTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/AtsTaskEndpointImplTest.java
@@ -30,6 +30,7 @@ import org.eclipse.osee.ats.api.workflow.WorkItemType;
 import org.eclipse.osee.ats.client.demo.DemoUtil;
 import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.ats.core.client.IAtsClient;
+import org.eclipse.osee.ats.core.users.AtsCoreUsers;
 import org.eclipse.osee.ats.demo.api.DemoUsers;
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -93,7 +94,8 @@ public class AtsTaskEndpointImplTest {
       Assert.assertEquals(1, workItems.size());
       Assert.assertEquals(codeTeamWfUuid, workItems.iterator().next().getUuid().longValue());
 
-      IAtsChangeSet changes = client.getStoreService().createAtsChangeSet(getClass().getSimpleName() + " - cleanup");
+      IAtsChangeSet changes = client.getStoreService().createAtsChangeSet(getClass().getSimpleName() + " - cleanup",
+         AtsCoreUsers.SYSTEM_USER);
       changes.deleteArtifact(task);
       changes.execute();
 
@@ -117,7 +119,8 @@ public class AtsTaskEndpointImplTest {
       Assert.assertEquals(1, workItems.size());
       Assert.assertEquals(codeTeamWfUuid, workItems.iterator().next().getUuid().longValue());
 
-      changes = client.getStoreService().createAtsChangeSet(getClass().getSimpleName() + " - cleanup");
+      changes = client.getStoreService().createAtsChangeSet(getClass().getSimpleName() + " - cleanup",
+         AtsCoreUsers.SYSTEM_USER);
       changes.deleteArtifact(task);
       changes.execute();
 
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/TaskRelatedToChangedArtifactTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/TaskRelatedToChangedArtifactTest.java
index a9dff8ee7ae..c2ad4f84c93 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/TaskRelatedToChangedArtifactTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/TaskRelatedToChangedArtifactTest.java
@@ -22,6 +22,7 @@ import org.eclipse.osee.ats.client.demo.DemoUtil;
 import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
+import org.eclipse.osee.ats.core.users.AtsCoreUsers;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.enums.DemoBranches;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -66,7 +67,8 @@ public class TaskRelatedToChangedArtifactTest {
          }
       }
       assertNotNull(reqWf);
-      IAtsChangeSet changes = AtsClientService.get().getStoreService().createAtsChangeSet(getClass().getSimpleName());
+      IAtsChangeSet changes = AtsClientService.get().getStoreService().createAtsChangeSet(getClass().getSimpleName(),
+         AtsCoreUsers.SYSTEM_USER);
       changes.relate(reqWf, AtsRelationTypes.Derive_To, codeWf);
 
       Artifact robotReq = ArtifactQuery.getArtifactFromTypeAndName(CoreArtifactTypes.SoftwareRequirement, "Robot API",
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/AtsQueryImplTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/AtsQueryImplTest.java
index a3e92049461..d11412c01c8 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/AtsQueryImplTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/AtsQueryImplTest.java
@@ -34,6 +34,7 @@ import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil;
 import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil;
 import org.eclipse.osee.ats.core.client.IAtsClient;
+import org.eclipse.osee.ats.core.users.AtsCoreUsers;
 import org.eclipse.osee.ats.demo.api.DemoArtifactToken;
 import org.eclipse.osee.ats.demo.api.DemoWorkType;
 import org.eclipse.osee.framework.core.data.ArtifactId;
@@ -180,7 +181,7 @@ public class AtsQueryImplTest {
       Conditions.checkNotNull(codeWf, "Code Team Workflow");
       Conditions.checkNotNull(codeTask, "Code Team Workflow");
 
-      services.getProgramService().setWorkPackage(wp, Arrays.asList(codeWf, codeTask));
+      services.getProgramService().setWorkPackage(wp, Arrays.asList(codeWf, codeTask), AtsCoreUsers.SYSTEM_USER);
 
       // by program
       query = queryService.createQuery(WorkItemType.TeamWorkflow);