Merge "Reorder modifiers"

[so.git] / bpmn / MSOInfrastructureBPMN / src / main / groovy / org / openecomp / mso / bpmn / infrastructure / scripts / DoCompareModelVersions.groovy

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCompareModelVersions.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCompareModelVersions.groovy
index 6d5249e..77b0657 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCompareModelVersions.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCompareModelVersions.groovy
@@ -136,7 +136,7 @@ public class DoCompareModelVersions extends AbstractServiceTaskProcessor {
                utils.log("INFO"," ***** Exit preProcessRequest *****",  isDebugEnabled)\r
        }\r
        \r
-   public void prepareDecomposeService_Target(Execution execution) {\r
+   public void prepareDecomposeService_Target(DelegateExecution execution) {\r
         def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
 \r
         try {\r
@@ -149,7 +149,7 @@ public class DoCompareModelVersions extends AbstractServiceTaskProcessor {
             "modelUuid":"${modelUuid}",\r
             "modelVersion":""\r
              }"""\r
-            execution.setVariable("serviceModelInfo", serviceModelInfo)\r
+            \r
             execution.setVariable("serviceModelInfo_Target", serviceModelInfo)\r
 \r
             utils.log("DEBUG", " ***** Completed prepareDecomposeService_Target of update generic e2e service ***** ", isDebugEnabled)\r
@@ -160,7 +160,7 @@ public class DoCompareModelVersions extends AbstractServiceTaskProcessor {
         }\r
      }\r
 \r
-    public void processDecomposition_Target(Execution execution) {\r
+    public void processDecomposition_Target(DelegateExecution execution) {\r
         def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
     \r
         utils.log("DEBUG", " ***** Inside processDecomposition_Target() of update generic e2e service flow ***** ", isDebugEnabled)    \r
@@ -174,7 +174,7 @@ public class DoCompareModelVersions extends AbstractServiceTaskProcessor {
         }\r
     }\r
  \r
-   public void prepareDecomposeService_Original(Execution execution) {\r
+   public void prepareDecomposeService_Original(DelegateExecution execution) {\r
         def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
 \r
         try {\r
@@ -187,7 +187,7 @@ public class DoCompareModelVersions extends AbstractServiceTaskProcessor {
             "modelUuid":"${modelUuid}",\r
             "modelVersion":""\r
              }"""\r
-            execution.setVariable("serviceModelInfo", serviceModelInfo)\r
+            \r
             execution.setVariable("serviceModelInfo_Original", serviceModelInfo)\r
 \r
             utils.log("DEBUG", " ***** Completed prepareDecomposeService_Original of update generic e2e service ***** ", isDebugEnabled)\r
@@ -198,7 +198,7 @@ public class DoCompareModelVersions extends AbstractServiceTaskProcessor {
         }\r
      }\r
 \r
-    public void processDecomposition_Original(Execution execution) {\r
+    public void processDecomposition_Original(DelegateExecution execution) {\r
         def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
     \r
         utils.log("DEBUG", " ***** Inside processDecomposition_Original() of update generic e2e service flow ***** ", isDebugEnabled)    \r
@@ -212,7 +212,7 @@ public class DoCompareModelVersions extends AbstractServiceTaskProcessor {
         }\r
     }  \r
 \r
-       public void doCompareModelVersions(execution){\r
+       public void doCompareModelVersions(DelegateExecution execution){\r
            def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
         utils.log("INFO", "======== Start doCompareModelVersions Process ======== ", isDebugEnabled)          \r
 \r
@@ -222,8 +222,8 @@ public class DoCompareModelVersions extends AbstractServiceTaskProcessor {
         List<Resource> allSR_target = serviceDecomposition_Target.getServiceResources();\r
         List<Resource> allSR_original = serviceDecomposition_Original.getServiceResources();\r
         \r
-        List<Resource> addedResource = new ArrayList<String>()\r
-        List<Resource> delResource = new ArrayList<String>()\r
+        List<Resource> addResourceList = new ArrayList<String>()\r
+        List<Resource> delResourceList = new ArrayList<String>()\r
         \r
         addResourceList.addAll(allSR_target)\r
         delResourceList.addAll(allSR_original)\r