refactor: Consolidate AtsReviewService

Change-Id: I5c55e8931cf4b1c3123e0751ef3852dced0ae7ef

6 files changed, 63 insertions, 57 deletions

diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java
index 47b251a12e9..d40afd4bc22 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java
@@ -36,7 +36,6 @@ import org.eclipse.osee.ats.core.client.task.TaskArtifact;
 import org.eclipse.osee.ats.core.client.task.TaskStates;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.util.AtsObjects;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.workflow.state.TeamState;
 import org.eclipse.osee.ats.demo.api.DemoArtifactTypes;
 import org.eclipse.osee.ats.demo.api.DemoTeam;
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 b5930f956f7..bc443becb3f 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
@@ -51,7 +51,6 @@ import org.eclipse.osee.ats.core.client.branch.AtsBranchUtil;
 import org.eclipse.osee.ats.core.client.config.AtsBulkLoad;
 import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact;
 import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact;
-import org.eclipse.osee.ats.core.client.review.DecisionReviewManager;
 import org.eclipse.osee.ats.core.client.review.DecisionReviewState;
 import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact;
 import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewManager;
@@ -408,10 +407,10 @@ public class AtsTestUtil {
          options.add(new SimpleDecisionReviewOption(DecisionReviewState.Completed.getName(), false, null));
          options.add(new SimpleDecisionReviewOption(DecisionReviewState.Followup.getName(), true,
             Arrays.asList(AtsClientService.get().getUserService().getCurrentUser().getUserId())));
-         decRevArt = DecisionReviewManager.createNewDecisionReview(teamWf, reviewBlockType,
-            AtsTestUtil.class.getSimpleName() + " Test Decision Review", relatedToState.getName(), "Decision Review",
-            options, Arrays.asList(AtsClientService.get().getUserService().getCurrentUser()), new Date(),
-            AtsClientService.get().getUserService().getCurrentUser(), changes);
+         decRevArt = (DecisionReviewArtifact) AtsClientService.get().getReviewService().createNewDecisionReview(teamWf,
+            reviewBlockType, AtsTestUtil.class.getSimpleName() + " Test Decision Review", relatedToState.getName(),
+            "Decision Review", options, Arrays.asList(AtsClientService.get().getUserService().getCurrentUser()),
+            new Date(), AtsClientService.get().getUserService().getCurrentUser(), changes).getStoreObject();
       }
       return decRevArt;
    }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewManagerTest.java
index f0a7cf126bf..2b1df81bbe9 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewManagerTest.java
@@ -15,12 +15,12 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
+import org.eclipse.osee.ats.api.review.IAtsDecisionReview;
 import org.eclipse.osee.ats.api.util.IAtsChangeSet;
 import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewOption;
 import org.eclipse.osee.ats.api.workdef.ReviewBlockType;
 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.review.DecisionReviewArtifact;
 import org.eclipse.osee.ats.core.client.review.DecisionReviewManager;
 import org.eclipse.osee.ats.core.client.review.DecisionReviewState;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
@@ -29,6 +29,7 @@ import org.eclipse.osee.ats.core.workflow.state.TeamState;
 import org.eclipse.osee.ats.demo.api.DemoUsers;
 import org.eclipse.osee.framework.core.enums.SystemUser;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -50,7 +51,8 @@ public class DecisionReviewManagerTest extends DecisionReviewManager {
    @org.junit.Test
    public void testGetDecisionReviewOptionsStr() throws OseeCoreException {
       Assert.assertEquals("Yes;Followup;<3333>\nNo;Completed;\n",
-         DecisionReviewManager.getDecisionReviewOptionsString(DecisionReviewManager.getDefaultDecisionReviewOptions()));
+         AtsClientService.get().getReviewService().getDecisionReviewOptionsString(
+            AtsClientService.get().getReviewService().getDefaultDecisionReviewOptions()));
    }
 
    @org.junit.Test
@@ -66,17 +68,19 @@ public class DecisionReviewManagerTest extends DecisionReviewManager {
       // create and transition decision review
       IAtsChangeSet changes = AtsClientService.get().createChangeSet(getClass().getSimpleName());
       String reviewTitle = "Test Review - " + teamWf.getName();
-      DecisionReviewArtifact decRev = DecisionReviewManager.createNewDecisionReviewAndTransitionToDecision(teamWf,
-         reviewTitle, "my description", AtsTestUtil.getAnalyzeStateDef().getName(), ReviewBlockType.Transition, options,
-         Arrays.asList(AtsClientService.get().getUserService().getCurrentUser()), new Date(),
-         AtsClientService.get().getUserService().getCurrentUser(), changes);
+      IAtsDecisionReview decRev =
+         AtsClientService.get().getReviewService().createNewDecisionReviewAndTransitionToDecision(teamWf, reviewTitle,
+            "my description", AtsTestUtil.getAnalyzeStateDef().getName(), ReviewBlockType.Transition, options,
+            Arrays.asList(AtsClientService.get().getUserService().getCurrentUser()), new Date(),
+            AtsClientService.get().getUserService().getCurrentUser(), changes);
       changes.execute();
 
       Assert.assertNotNull(decRev);
       Assert.assertFalse(
-         String.format("Decision Review artifact should not be dirty [%s]", Artifacts.getDirtyReport(decRev)),
-         decRev.isDirty());
-      Assert.assertEquals(DecisionReviewState.Decision.getName(), decRev.getCurrentStateName());
+         String.format("Decision Review artifact should not be dirty [%s]",
+            Artifacts.getDirtyReport(((Artifact) decRev.getStoreObject()))),
+         ((Artifact) decRev.getStoreObject()).isDirty());
+      Assert.assertEquals(DecisionReviewState.Decision.getName(), decRev.getStateMgr().getCurrentStateName());
       Assert.assertEquals("Joe Smith", decRev.getStateMgr().getAssigneesStr());
 
    }
@@ -94,18 +98,20 @@ public class DecisionReviewManagerTest extends DecisionReviewManager {
       // create and transition decision review
       IAtsChangeSet changes = AtsClientService.get().createChangeSet(getClass().getSimpleName());
       String reviewTitle = "Test Review - " + teamWf.getName();
-      DecisionReviewArtifact decRev = DecisionReviewManager.createNewDecisionReviewAndTransitionToDecision(teamWf,
-         reviewTitle, "my description", AtsTestUtil.getAnalyzeStateDef().getName(), ReviewBlockType.Transition, options,
-         Arrays.asList(AtsClientService.get().getUserServiceClient().getUserFromToken(SystemUser.UnAssigned)),
-         new Date(), AtsClientService.get().getUserService().getCurrentUser(), changes);
+      IAtsDecisionReview decRev =
+         AtsClientService.get().getReviewService().createNewDecisionReviewAndTransitionToDecision(teamWf, reviewTitle,
+            "my description", AtsTestUtil.getAnalyzeStateDef().getName(), ReviewBlockType.Transition, options,
+            Arrays.asList(AtsClientService.get().getUserServiceClient().getUserFromToken(SystemUser.UnAssigned)),
+            new Date(), AtsClientService.get().getUserService().getCurrentUser(), changes);
       changes.execute();
 
       Assert.assertNotNull(decRev);
       Assert.assertEquals(reviewTitle, decRev.getName());
       Assert.assertFalse(
-         String.format("Decision Review artifact should not be dirty [%s]", Artifacts.getDirtyReport(decRev)),
-         decRev.isDirty());
-      Assert.assertEquals(DecisionReviewState.Decision.getName(), decRev.getCurrentStateName());
+         String.format("Decision Review artifact should not be dirty [%s]",
+            Artifacts.getDirtyReport(((Artifact) decRev.getStoreObject()))),
+         ((Artifact) decRev.getStoreObject()).isDirty());
+      Assert.assertEquals(DecisionReviewState.Decision.getName(), decRev.getStateMgr().getCurrentStateName());
       Assert.assertEquals("UnAssigned", decRev.getStateMgr().getAssigneesStr());
 
    }
@@ -117,20 +123,23 @@ public class DecisionReviewManagerTest extends DecisionReviewManager {
 
       String reviewTitle = "Test Review - " + teamWf.getName();
       IAtsChangeSet changes = AtsClientService.get().createChangeSet(getClass().getSimpleName());
-      DecisionReviewArtifact decRev =
-         DecisionReviewManager.createNewDecisionReview(teamWf, ReviewBlockType.Commit, reviewTitle,
-            TeamState.Implement.getName(), "description", DecisionReviewManager.getDefaultDecisionReviewOptions(),
-            Arrays.asList(AtsClientService.get().getUserServiceClient().getUserFromToken(DemoUsers.Alex_Kay)),
-            new Date(), AtsClientService.get().getUserService().getCurrentUser(), changes);
+      IAtsDecisionReview decRev = AtsClientService.get().getReviewService().createNewDecisionReview(teamWf,
+         ReviewBlockType.Commit, reviewTitle, TeamState.Implement.getName(), "description",
+         AtsClientService.get().getReviewService().getDefaultDecisionReviewOptions(),
+         Arrays.asList(AtsClientService.get().getUserServiceClient().getUserFromToken(DemoUsers.Alex_Kay)), new Date(),
+         AtsClientService.get().getUserService().getCurrentUser(), changes);
       changes.execute();
 
       Assert.assertNotNull(decRev);
       Assert.assertEquals(reviewTitle, decRev.getName());
-      Assert.assertEquals(DecisionReviewState.Prepare.getName(), decRev.getCurrentStateName());
+      Assert.assertEquals(DecisionReviewState.Prepare.getName(), decRev.getStateMgr().getCurrentStateName());
       Assert.assertEquals("Alex Kay", decRev.getStateMgr().getAssigneesStr());
       Assert.assertEquals(TeamState.Implement.getName(),
-         decRev.getSoleAttributeValue(AtsAttributeTypes.RelatedToState));
-      Assert.assertEquals(ReviewBlockType.Commit.name(), decRev.getSoleAttributeValue(AtsAttributeTypes.ReviewBlocks));
+         AtsClientService.get().getAttributeResolver().getSoleAttributeValue(decRev, AtsAttributeTypes.RelatedToState,
+            ""));
+      Assert.assertEquals(ReviewBlockType.Commit.name(),
+         AtsClientService.get().getAttributeResolver().getSoleAttributeValue(decRev, AtsAttributeTypes.ReviewBlocks,
+            ""));
    }
 
    @org.junit.Test
@@ -140,11 +149,11 @@ public class DecisionReviewManagerTest extends DecisionReviewManager {
 
       String reviewTitle = "Test Review - " + teamWf.getName();
       IAtsChangeSet changes = AtsClientService.get().createChangeSet(getClass().getSimpleName());
-      DecisionReviewArtifact decRev =
-         DecisionReviewManager.createNewDecisionReview(teamWf, ReviewBlockType.Commit, reviewTitle,
-            TeamState.Implement.getName(), "description", DecisionReviewManager.getDefaultDecisionReviewOptions(),
-            Arrays.asList(AtsClientService.get().getUserServiceClient().getUserFromToken(SystemUser.UnAssigned)),
-            new Date(), AtsClientService.get().getUserService().getCurrentUser(), changes);
+      IAtsDecisionReview decRev = AtsClientService.get().getReviewService().createNewDecisionReview(teamWf,
+         ReviewBlockType.Commit, reviewTitle, TeamState.Implement.getName(), "description",
+         AtsClientService.get().getReviewService().getDefaultDecisionReviewOptions(),
+         Arrays.asList(AtsClientService.get().getUserServiceClient().getUserFromToken(SystemUser.UnAssigned)),
+         new Date(), AtsClientService.get().getUserService().getCurrentUser(), changes);
       changes.execute();
 
       Assert.assertNotNull(decRev);
@@ -158,17 +167,20 @@ public class DecisionReviewManagerTest extends DecisionReviewManager {
       TeamWorkFlowArtifact teamWf = AtsTestUtil.getTeamWf();
 
       IAtsChangeSet changes = AtsClientService.get().createChangeSet(getClass().getSimpleName());
-      DecisionReviewArtifact decRev = DecisionReviewManager.createNewDecisionReview(teamWf, ReviewBlockType.Commit,
-         true, new Date(), AtsClientService.get().getUserService().getCurrentUser(), changes);
+      IAtsDecisionReview decRev = AtsClientService.get().getReviewService().createNewDecisionReview(teamWf,
+         ReviewBlockType.Commit, true, new Date(), AtsClientService.get().getUserService().getCurrentUser(), changes);
       changes.execute();
 
       Assert.assertNotNull(decRev);
       Assert.assertEquals("Should we do this?  Yes will require followup, No will not", decRev.getName());
-      Assert.assertEquals(DecisionReviewState.Prepare.getName(), decRev.getCurrentStateName());
+      Assert.assertEquals(DecisionReviewState.Prepare.getName(), decRev.getStateMgr().getCurrentStateName());
       Assert.assertEquals("Joe Smith", decRev.getStateMgr().getAssigneesStr());
-      Assert.assertEquals(TeamState.Analyze.getName(), decRev.getSoleAttributeValue(AtsAttributeTypes.RelatedToState));
+      Assert.assertEquals(TeamState.Analyze.getName(),
+         AtsClientService.get().getAttributeResolver().getSoleAttributeValue(decRev, AtsAttributeTypes.RelatedToState,
+            ""));
       Assert.assertEquals(ReviewBlockType.Commit.name(),
-         decRev.getSoleAttributeValue(AtsAttributeTypes.ReviewBlocks, ""));
+         AtsClientService.get().getAttributeResolver().getSoleAttributeValue(decRev, AtsAttributeTypes.ReviewBlocks,
+            ""));
    }
 
 }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java
index bd1e088d0dc..4b4527faeec 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java
@@ -19,9 +19,7 @@ import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition;
 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.review.DecisionReviewArtifact;
-import org.eclipse.osee.ats.core.client.review.DecisionReviewManager;
 import org.eclipse.osee.ats.core.client.review.DecisionReviewState;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.editor.stateItem.AtsDecisionReviewDecisionStateItem;
 import org.eclipse.osee.ats.mocks.MockStateDefinition;
 import org.eclipse.osee.ats.util.AtsUtil;
@@ -37,7 +35,7 @@ import org.junit.Test;
 
 /**
  * Test Case for {@link AtsDecisionReviewDecisionStateItem}
- * 
+ *
  * @author Donald G. Dunne
  */
 public class AtsDecisionReviewDecisionStateItemTest {
@@ -55,8 +53,8 @@ public class AtsDecisionReviewDecisionStateItemTest {
             AtsClientService.get().getAtsBranch());
          decRevArt.setName(getClass().getSimpleName());
          decRevArt.setSoleAttributeValue(AtsAttributeTypes.DecisionReviewOptions,
-            DecisionReviewManager.getDecisionReviewOptionsString(
-               DecisionReviewManager.getDefaultDecisionReviewOptions()));
+            AtsClientService.get().getReviewService().getDecisionReviewOptionsString(
+               AtsClientService.get().getReviewService().getDefaultDecisionReviewOptions()));
          decRevArt.persist(getClass().getSimpleName());
       }
    }
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java
index 074bf1ea086..1bec6a68926 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java
@@ -19,9 +19,7 @@ import org.eclipse.osee.ats.api.workflow.transition.TransitionResults;
 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.review.DecisionReviewArtifact;
-import org.eclipse.osee.ats.core.client.review.DecisionReviewManager;
 import org.eclipse.osee.ats.core.client.review.DecisionReviewState;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.editor.stateItem.AtsDecisionReviewPrepareStateItem;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -34,7 +32,7 @@ import org.junit.Test;
 
 /**
  * Test Case for {@link AtsDecisionReviewPrepareStateItem}
- * 
+ *
  * @author Donald G. Dunne
  */
 public class AtsDecisionReviewPrepareStateItemTest {
@@ -66,8 +64,8 @@ public class AtsDecisionReviewPrepareStateItemTest {
       Assert.assertNotNull(decRevArt);
 
       // set valid options
-      String decisionOptionStr =
-         DecisionReviewManager.getDecisionReviewOptionsString(DecisionReviewManager.getDefaultDecisionReviewOptions());
+      String decisionOptionStr = AtsClientService.get().getReviewService().getDecisionReviewOptionsString(
+         AtsClientService.get().getReviewService().getDefaultDecisionReviewOptions());
       decRevArt.setSoleAttributeValue(AtsAttributeTypes.DecisionReviewOptions, decisionOptionStr);
       decRevArt.persist(getClass().getSimpleName());
 
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsDeleteManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsDeleteManagerTest.java
index 5bf1e2a9e9e..52f64eab3a9 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsDeleteManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsDeleteManagerTest.java
@@ -27,10 +27,8 @@ 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.action.ActionManager;
 import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact;
-import org.eclipse.osee.ats.core.client.review.DecisionReviewManager;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.config.ActionableItems;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.core.workflow.state.TeamState;
 import org.eclipse.osee.ats.demo.api.DemoActionableItems;
 import org.eclipse.osee.ats.demo.api.DemoArtifactTypes;
@@ -162,8 +160,8 @@ public class AtsDeleteManagerTest {
    }
 
    private void verifyExists(TestNames testName, int expectedNumActions, int expectedNumCodeWorkflows, int expectedNumReqWorkflows, int expectedNumTasks, int expectedNumReviews) throws OseeCoreException {
-      List<Artifact> artifacts = ArtifactQuery.getArtifactListFromName(testName.toString(), AtsClientService.get().getAtsBranch(),
-         EXCLUDE_DELETED, QueryOption.CONTAINS_MATCH_OPTIONS);
+      List<Artifact> artifacts = ArtifactQuery.getArtifactListFromName(testName.toString(),
+         AtsClientService.get().getAtsBranch(), EXCLUDE_DELETED, QueryOption.CONTAINS_MATCH_OPTIONS);
       CountingMap<IArtifactType> countMap = new CountingMap<>();
       for (Artifact artifact : artifacts) {
          countMap.put(artifact.getArtifactType());
@@ -197,9 +195,11 @@ public class AtsDeleteManagerTest {
       }
 
       DecisionReviewArtifact decRev =
-         DecisionReviewManager.createNewDecisionReview(teamArt, ReviewBlockType.None, testName.name(),
-            TeamState.Endorse.getName(), "Description", DecisionReviewManager.getDefaultDecisionReviewOptions(),
-            Arrays.asList(AtsClientService.get().getUserService().getCurrentUser()), createdDate, createdBy, changes);
+         (DecisionReviewArtifact) AtsClientService.get().getReviewService().createNewDecisionReview(teamArt,
+            ReviewBlockType.None, testName.name(), TeamState.Endorse.getName(), "Description",
+            AtsClientService.get().getReviewService().getDefaultDecisionReviewOptions(),
+            Arrays.asList(AtsClientService.get().getUserService().getCurrentUser()), createdDate, createdBy,
+            changes).getStoreObject();
       changes.add(decRev);
 
       changes.execute();