feature: Create WorkDefinition model to abstract ATS workflow definitions

3 files changed, 10 insertions, 9 deletions

diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoAddDecisionReviewRule.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoAddDecisionReviewRule.java
index 194f213b929..3230dd1a75b 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoAddDecisionReviewRule.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoAddDecisionReviewRule.java
@@ -22,13 +22,13 @@ import org.eclipse.osee.framework.logging.OseeLog;
  */
 public class DemoAddDecisionReviewRule extends AtsAddDecisionReviewRule {
 
-   public static String ID = "atsAddDecisionReview.test.addDecisionReview";
+   public static String NAME = "atsAddDecisionReview.test.addDecisionReview";
 
    public DemoAddDecisionReviewRule(String forState, ReviewBlockType reviewBlockType, StateEventType stateEventType) {
-      super(ID + "." + forState + "." + reviewBlockType.name() + "." + stateEventType,
-         ID + "." + forState + "." + reviewBlockType.name() + "." + stateEventType);
+      super(NAME + "." + forState + "." + reviewBlockType.name() + "." + stateEventType,
+         NAME + "." + forState + "." + reviewBlockType.name() + "." + stateEventType);
       setDescription("This is a rule created to test the Review rules.");
-      setDecisionParameterValue(this, DecisionParameter.title, "Auto-created Decision Review from ruleId: " + getId());
+      setDecisionParameterValue(this, DecisionParameter.title, "Auto-created Decision Review from ruleId: " + getName());
       setDecisionParameterValue(this, DecisionParameter.reviewBlockingType, reviewBlockType.name());
       setDecisionParameterValue(this, DecisionParameter.forState, forState);
       setDecisionParameterValue(this, DecisionParameter.forEvent, stateEventType.name());
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoAddPeerToPeerReviewRule.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoAddPeerToPeerReviewRule.java
index cb66e53cb21..e42d9095e53 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoAddPeerToPeerReviewRule.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoAddPeerToPeerReviewRule.java
@@ -28,7 +28,7 @@ public class DemoAddPeerToPeerReviewRule extends AtsAddDecisionReviewRule {
       super(ID + "." + forState + "." + reviewBlockType.name() + "." + stateEventType,
          ID + "." + forState + "." + reviewBlockType.name() + "." + stateEventType);
       setDescription("This is a rule created to test the Review rules.");
-      setDecisionParameterValue(this, DecisionParameter.title, "Auto-created Decision Review from ruleId " + getId());
+      setDecisionParameterValue(this, DecisionParameter.title, "Auto-created Decision Review from ruleId " + getName());
       setDecisionParameterValue(this, DecisionParameter.reviewBlockingType, reviewBlockType.name());
       setDecisionParameterValue(this, DecisionParameter.forState, forState);
       setDecisionParameterValue(this, DecisionParameter.forEvent, stateEventType.name());
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoSWDesignWorkFlowDefinition.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoSWDesignWorkFlowDefinition.java
index 09a28804ea2..936f903dd87 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoSWDesignWorkFlowDefinition.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/workflow/DemoSWDesignWorkFlowDefinition.java
@@ -48,6 +48,7 @@ public class DemoSWDesignWorkFlowDefinition extends TeamWorkflowDefinition {
       DemoAddPeerToPeerReviewRule peerCommitBranchRule =
          new DemoAddPeerToPeerReviewRule(TeamState.Implement.getPageName(), ReviewBlockType.None,
             StateEventType.CommitBranch);
+
       // Import decision and peer rules into database
       AtsWorkDefinitions.importWorkItemDefinitionsIntoDb(writeType, null,
          Arrays.asList(decisionTransitionToRule, decisionCreateBranchRule, peerTransitionToRule, peerCommitBranchRule));
@@ -60,14 +61,14 @@ public class DemoSWDesignWorkFlowDefinition extends TeamWorkflowDefinition {
 
       // Add Non-blocking createBranch decision review to Implement state
       WorkItemDefinitionFactory.relateWorkItemDefinitions(ID + "." + TeamState.Analyze.getPageName(),
-         decisionTransitionToRule.getId());
+         decisionTransitionToRule.getName());
       WorkItemDefinitionFactory.relateWorkItemDefinitions(ID + "." + TeamState.Implement.getPageName(),
-         decisionCreateBranchRule.getId());
+         decisionCreateBranchRule.getName());
 
       // Add Non-blocking commitBranch peerToPeer review to Implement state
       WorkItemDefinitionFactory.relateWorkItemDefinitions(ID + "." + TeamState.Authorize.getPageName(),
-         peerTransitionToRule.getId());
+         peerTransitionToRule.getName());
       WorkItemDefinitionFactory.relateWorkItemDefinitions(ID + "." + TeamState.Implement.getPageName(),
-         peerCommitBranchRule.getId());
+         peerCommitBranchRule.getName());
    }
 }