Simplify boolean expressions in groovy

Change-Id: I8dc254337f5975c2af6a2de74f20eff919993cf2
Issue-ID: SO-437
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericUtils.groovy
index 3397aa9..baebf79 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericUtils.groovy
@@ -11,7 +11,7 @@ class GenericUtils extends StringUtils{
                        return true;\r
                }\r
                for (int i = 0; i < strLen; i++) {\r
-                       if (Character.isWhitespace(cs.charAt(i)) == false) {\r
+                       if (!Character.isWhitespace(cs.charAt(i))) {\r
                                return false;\r
                        }\r
                }\r

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy
index 437d592..9de1708 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy
@@ -725,7 +725,7 @@ class SDNCAdapterUtils {
                        execution.setVariable(prefix+'sdncResponseSuccess', false)\r
                        taskProcessor.utils.log("DEBUG", "Response" + ' = ' + (response == null ? "" : System.lineSeparator()) + response, isDebugLogEnabled)\r
 \r
-                       if (successIndicator == true){\r
+                       if (successIndicator){\r
                                if (response == null || response.trim().equals("")) {\r
                                        taskProcessor.utils.log("DEBUG", response + ' is empty');\r
                                        exceptionUtil.buildAndThrowWorkflowException(execution, 500, "SDNCAdapter Workflow Response is Empty")\r
@@ -842,7 +842,7 @@ class SDNCAdapterUtils {
                                        execution.setVariable(prefix+'sdncResponseSuccess', false)\r
 \r
                                        taskProcessor.utils.log("sdncAdapter Success Indicator is: " + success, isDebugLogEnabled)\r
-                                       if (success == true) {\r
+                                       if (success) {\r
 \r
                                                // we need to look inside the request data for error\r
                                                def String callbackRequestData = taskProcessor.utils.getNodeXml(response, 'RequestData', false)\r
@@ -974,4 +974,4 @@ class SDNCAdapterUtils {
        \r
        \r
 \r
-}
+}\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
index 2b2d622..fd9b6d4 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
@@ -233,7 +233,7 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
                try {
                        String serviceInstanceName = execution.getVariable("serviceInstanceName")
                        boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")
-                       if(succInAAI != true){
+                       if(!succInAAI){
                                utils.log("INFO","Error getting Service-instance from AAI", + serviceInstanceName, isDebugEnabled)
                                WorkflowException workflowException = execution.getVariable("WorkflowException")
                                utils.logAudit("workflowException: " + workflowException)
@@ -250,7 +250,7 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
                        else
                        {
                                boolean foundInAAI = execution.getVariable("GENGS_FoundIndicator")
-                               if(foundInAAI == true){
+                               if(foundInAAI){
                                        utils.log("INFO","Found Service-instance in AAI", isDebugEnabled)
                                        msg = "ServiceInstance already exists in AAI:" + serviceInstanceName
                                        utils.log("INFO", msg, isDebugEnabled)
@@ -274,7 +274,7 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
                try {
                        String serviceInstanceId = execution.getVariable("serviceInstanceId")
                        boolean succInAAI = execution.getVariable("GENPS_SuccessIndicator")
-                       if(succInAAI != true){
+                       if(!succInAAI){
                                utils.log("INFO","Error putting Service-instance in AAI", + serviceInstanceId, isDebugEnabled)
                                WorkflowException workflowException = execution.getVariable("WorkflowException")
                                utils.logAudit("workflowException: " + workflowException)
@@ -313,7 +313,7 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
                try {
                        String serviceInstanceName = execution.getVariable("serviceInstanceName")
                        boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")
-                       if(succInAAI != true){
+                       if(!succInAAI){
                                utils.log("INFO","Error getting Service-instance from AAI in postProcessAAIGET2", + serviceInstanceName, isDebugEnabled)
                                WorkflowException workflowException = execution.getVariable("WorkflowException")
                                utils.logAudit("workflowException: " + workflowException)
@@ -330,7 +330,7 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
                        else
                        {
                                boolean foundInAAI = execution.getVariable("GENGS_FoundIndicator")
-                               if(foundInAAI == true){
+                               if(foundInAAI){
                                        String aaiService = execution.getVariable("GENGS_service")
                                        if (!isBlank(aaiService) && (utils.nodeExists(aaiService, "service-instance-name"))) {
                                                execution.setVariable("serviceInstanceName",  utils.getNodeText1(aaiService, "service-instance-name"))

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceRollback.groovy
index dfe210c..743eb1a 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceRollback.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceRollback.groovy
@@ -178,14 +178,14 @@ public class DoCreateE2EServiceInstanceRollback extends AbstractServiceTaskProce
                        String serviceInstanceId = execution.getVariable("serviceInstanceId")\r
                        boolean rollbackAAI = execution.getVariable("rollbackAAI")\r
                        boolean rollbackSDNC = execution.getVariable("rollbackSDNC")\r
-                       if (rollbackAAI == true || rollbackSDNC == true)\r
+                       if (rollbackAAI || rollbackSDNC)\r
                        {\r
                                execution.setVariable("rolledBack", true)\r
                        }\r
-                       if (rollbackAAI == true)\r
+                       if (rollbackAAI)\r
                        {\r
                                boolean succInAAI = execution.getVariable("GENDS_SuccessIndicator")\r
-                               if(succInAAI != true){\r
+                               if(!succInAAI){\r
                                        execution.setVariable("rolledBack", false) //both sdnc and aai must be successful to declare rollback Succesful\r
                                        execution.setVariable("rollbackError", "Error deleting service-instance in AAI for rollback")\r
                                        utils.log("DEBUG","Error deleting service-instance in AAI for rollback", + serviceInstanceId, isDebugEnabled)\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceV2.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceV2.groovy
index cc34b03..ea29de9 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceV2.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstanceV2.groovy
@@ -227,7 +227,7 @@ public class DoCreateE2EServiceInstanceV2 extends AbstractServiceTaskProcessor {
                try {\r
                        String serviceInstanceName = execution.getVariable("serviceInstanceName")\r
                        boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")\r
-                       if(succInAAI != true){\r
+                       if(!succInAAI){\r
                                utils.log("INFO","Error getting Service-instance from AAI", + serviceInstanceName, isDebugEnabled)\r
                                WorkflowException workflowException = execution.getVariable("WorkflowException")\r
                                utils.logAudit("workflowException: " + workflowException)\r
@@ -244,7 +244,7 @@ public class DoCreateE2EServiceInstanceV2 extends AbstractServiceTaskProcessor {
                        else\r
                        {\r
                                boolean foundInAAI = execution.getVariable("GENGS_FoundIndicator")\r
-                               if(foundInAAI == true){\r
+                               if(foundInAAI){\r
                                        utils.log("INFO","Found Service-instance in AAI", isDebugEnabled)\r
                                        msg = "ServiceInstance already exists in AAI:" + serviceInstanceName\r
                                        utils.log("INFO", msg, isDebugEnabled)\r
@@ -270,7 +270,7 @@ public class DoCreateE2EServiceInstanceV2 extends AbstractServiceTaskProcessor {
                try {\r
                        String serviceInstanceId = execution.getVariable("serviceInstanceId")\r
                        boolean succInAAI = execution.getVariable("GENPS_SuccessIndicator")\r
-                       if(succInAAI != true){\r
+                       if(!succInAAI){\r
                                utils.log("INFO","Error putting Service-instance in AAI", + serviceInstanceId, isDebugEnabled)\r
                                WorkflowException workflowException = execution.getVariable("WorkflowException")\r
                                utils.logAudit("workflowException: " + workflowException)\r
@@ -311,7 +311,7 @@ public class DoCreateE2EServiceInstanceV2 extends AbstractServiceTaskProcessor {
                try {\r
                        String serviceInstanceName = execution.getVariable("serviceInstanceName")\r
                        boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")\r
-                       if(succInAAI != true){\r
+                       if(!succInAAI){\r
                                utils.log("INFO","Error getting Service-instance from AAI in postProcessAAIGET2", + serviceInstanceName, isDebugEnabled)\r
                                WorkflowException workflowException = execution.getVariable("WorkflowException")\r
                                utils.logAudit("workflowException: " + workflowException)\r
@@ -328,7 +328,7 @@ public class DoCreateE2EServiceInstanceV2 extends AbstractServiceTaskProcessor {
                        else\r
                        {\r
                                boolean foundInAAI = execution.getVariable("GENGS_FoundIndicator")\r
-                               if(foundInAAI == true){\r
+                               if(foundInAAI){\r
                                        String aaiService = execution.getVariable("GENGS_service")\r
                                        if (!isBlank(aaiService) && (utils.nodeExists(aaiService, "service-instance-name"))) {\r
                                                execution.setVariable("serviceInstanceName",  utils.getNodeText1(aaiService, "service-instance-name"))\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
index affb932..91ecabc 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
@@ -368,7 +368,7 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
                try {
                        String serviceInstanceName = execution.getVariable("serviceInstanceName")
                        boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")
-                       if(succInAAI != true){
+                       if(!succInAAI){
                                utils.log("DEBUG","Error getting Service-instance from AAI", + serviceInstanceName, isDebugEnabled)
                                WorkflowException workflowException = execution.getVariable("WorkflowException")
                                utils.logAudit("workflowException: " + workflowException)
@@ -385,7 +385,7 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
                        else
                        {
                                boolean foundInAAI = execution.getVariable("GENGS_FoundIndicator")
-                               if(foundInAAI == true){
+                               if(foundInAAI){
                                        utils.log("DEBUG","Found Service-instance in AAI", isDebugEnabled)
                                        msg = "ServiceInstance already exists in AAI:" + serviceInstanceName
                                        utils.log("DEBUG", msg, isDebugEnabled)
@@ -409,7 +409,7 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
                try {
                        String serviceInstanceId = execution.getVariable("serviceInstanceId")
                        boolean succInAAI = execution.getVariable("GENPS_SuccessIndicator")
-                       if(succInAAI != true){
+                       if(!succInAAI){
                                utils.log("DEBUG","Error putting Service-instance in AAI", + serviceInstanceId, isDebugEnabled)
                                WorkflowException workflowException = execution.getVariable("WorkflowException")
                                utils.logAudit("workflowException: " + workflowException)
@@ -576,7 +576,7 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
                try {
                        String serviceInstanceName = execution.getVariable("serviceInstanceName")
                        boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")
-                       if(succInAAI != true){
+                       if(!succInAAI){
                                utils.log("DEBUG","Error getting Service-instance from AAI in postProcessAAIGET2", + serviceInstanceName, isDebugEnabled)
                                WorkflowException workflowException = execution.getVariable("WorkflowException")
                                utils.logAudit("workflowException: " + workflowException)
@@ -593,7 +593,7 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
                        else
                        {
                                boolean foundInAAI = execution.getVariable("GENGS_FoundIndicator")
-                               if(foundInAAI == true){
+                               if(foundInAAI){
                                        String aaiService = execution.getVariable("GENGS_service")
                                        if (!isBlank(aaiService) && (utils.nodeExists(aaiService, "service-instance-name"))) {
                                                execution.setVariable("serviceInstanceName",  utils.getNodeText1(aaiService, "service-instance-name"))

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstanceRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstanceRollback.groovy
index 3c12c0b..9a84c6b 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstanceRollback.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstanceRollback.groovy
@@ -177,14 +177,14 @@ public class DoCreateServiceInstanceRollback extends AbstractServiceTaskProcesso
                        String serviceInstanceId = execution.getVariable("serviceInstanceId")\r
                        boolean rollbackAAI = execution.getVariable("rollbackAAI")\r
                        boolean rollbackSDNC = execution.getVariable("rollbackSDNC")\r
-                       if (rollbackAAI == true || rollbackSDNC == true)\r
+                       if (rollbackAAI || rollbackSDNC)\r
                        {\r
                                execution.setVariable("rolledBack", true)\r
                        }\r
-                       if (rollbackAAI == true)\r
+                       if (rollbackAAI)\r
                        {\r
                                boolean succInAAI = execution.getVariable("GENDS_SuccessIndicator")\r
-                               if(succInAAI != true){\r
+                               if(!succInAAI){\r
                                        execution.setVariable("rolledBack", false) //both sdnc and aai must be successful to declare rollback Succesful\r
                                        execution.setVariable("rollbackError", "Error deleting service-instance in AAI for rollback")\r
                                        utils.log("DEBUG","Error deleting service-instance in AAI for rollback", + serviceInstanceId, isDebugEnabled)\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModulesRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModulesRollback.groovy
index 82eea43..c5d87d8 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModulesRollback.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModulesRollback.groovy
@@ -181,7 +181,7 @@ class DoCreateVnfAndModulesRollback extends AbstractServiceTaskProcessor {
                        utils.log("ERROR", "Exception Occured Processing postProcessCreateVfModuleRollback. Exception is:\n" + e, isDebugLogEnabled)\r
                        exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during postProcessCreateVfModuleRollback Method:\n" + e.getMessage())\r
                }\r
-               if (rolledBack == false) {\r
+               if (!rolledBack) {\r
                        logDebug("Failure on DoCreateVfModuleRollback", isDebugLogEnabled)\r
                        utils.log("ERROR", "Unsuccessful rollback of DoCreateVfModule")\r
                        exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during rollback of DoCreateVfModule")\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy
index bf61013..40e2baa 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy
@@ -317,7 +317,7 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
                        boolean foundInAAI = execution.getVariable("GENGS_FoundIndicator")
                        String serviceType = ""
 
-                       if(foundInAAI == true){
+                       if(foundInAAI){
                                utils.log("INFO","Found Service-instance in AAI", isDebugEnabled)
 
                                String siData = execution.getVariable("GENGS_service")
@@ -412,7 +412,7 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
                                }
                        }else{
                                boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")
-                               if(succInAAI != true){
+                               if(!succInAAI){
                                        utils.log("INFO","Error getting Service-instance from AAI", + serviceInstanceId, isDebugEnabled)
                                        WorkflowException workflowException = execution.getVariable("WorkflowException")
                                        utils.logAudit("workflowException: " + workflowException)
@@ -446,7 +446,7 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
                try {
                        String serviceInstanceId = execution.getVariable("serviceInstanceId")
                        boolean succInAAI = execution.getVariable("GENDS_SuccessIndicator")
-                       if(succInAAI != true){
+                       if(!succInAAI){
                                msg = "Error deleting Service-instance in AAI" + serviceInstanceId
                                utils.log("INFO", msg, isDebugEnabled)
                                WorkflowException workflowException = execution.getVariable("WorkflowException")

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstanceV2.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstanceV2.groovy
index 7de0ed0..4c3f6bc 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstanceV2.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstanceV2.groovy
@@ -180,7 +180,7 @@ public class DoCustomDeleteE2EServiceInstanceV2 extends AbstractServiceTaskProce
                        String serviceType = ""\r
                        \r
 \r
-                       if(foundInAAI == true){\r
+                       if(foundInAAI){\r
                                utils.log("INFO","Found Service-instance in AAI", isDebugEnabled)\r
 \r
                                String siData = execution.getVariable("GENGS_service")\r
@@ -194,7 +194,7 @@ public class DoCustomDeleteE2EServiceInstanceV2 extends AbstractServiceTaskProce
                                \r
                        }else{\r
                                boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")\r
-                               if(succInAAI != true){\r
+                               if(!succInAAI){\r
                                        utils.log("INFO","Error getting Service-instance from AAI", + serviceInstanceId, isDebugEnabled)\r
                                        WorkflowException workflowException = execution.getVariable("WorkflowException")\r
                                        utils.logAudit("workflowException: " + workflowException)\r
@@ -964,7 +964,7 @@ public class DoCustomDeleteE2EServiceInstanceV2 extends AbstractServiceTaskProce
                try {\r
                        String serviceInstanceId = execution.getVariable("serviceInstanceId")\r
                        boolean succInAAI = execution.getVariable("GENDS_SuccessIndicator")\r
-                       if(succInAAI != true){\r
+                       if(!succInAAI){\r
                                msg = "Error deleting Service-instance in AAI" + serviceInstanceId\r
                                utils.log("INFO", msg, isDebugEnabled)\r
                                WorkflowException workflowException = execution.getVariable("WorkflowException")\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy
index edebc3d..a340755 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy
@@ -273,7 +273,7 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
                                        NetworkUtils networkUtils = new NetworkUtils()
                                isVfRelationshipExist = networkUtils.isVfRelationshipExist(aaiResponseAsString)
                                        execution.setVariable(Prefix + "isVfRelationshipExist", isVfRelationshipExist)
-                                       if (isVfRelationshipExist == true) {
+                                       if (isVfRelationshipExist) {
                                                String relationshipMessage = "AAI Query Success Response but 'vf-module' relationship exist, not allowed to delete: network Id: " + networkId
                                                exceptionUtil.buildWorkflowException(execution, 2500, relationshipMessage)
 

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy
index 1c9b80a..fd4162f 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy
@@ -308,7 +308,7 @@ public class DoDeleteServiceInstance extends AbstractServiceTaskProcessor {
                        boolean foundInAAI = execution.getVariable("GENGS_FoundIndicator")
                        String serviceType = ""
 
-                       if(foundInAAI == true){
+                       if(foundInAAI){
                                utils.log("DEBUG","Found Service-instance in AAI", isDebugEnabled)
 
                                //Extract GlobalSubscriberId
@@ -409,7 +409,7 @@ public class DoDeleteServiceInstance extends AbstractServiceTaskProcessor {
                                }
                        }else{
                                boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")
-                               if(succInAAI != true){
+                               if(!succInAAI){
                                        utils.log("DEBUG","Error getting Service-instance from AAI", + serviceInstanceId, isDebugEnabled)
                                        WorkflowException workflowException = execution.getVariable("WorkflowException")
                                        utils.logAudit("workflowException: " + workflowException)
@@ -443,7 +443,7 @@ public class DoDeleteServiceInstance extends AbstractServiceTaskProcessor {
                try {
                        String serviceInstanceId = execution.getVariable("serviceInstanceId")
                        boolean succInAAI = execution.getVariable("GENDS_SuccessIndicator")
-                       if(succInAAI != true){
+                       if(!succInAAI){
                                msg = "Error deleting Service-instance in AAI" + serviceInstanceId
                                utils.log("DEBUG", msg, isDebugEnabled)
                                WorkflowException workflowException = execution.getVariable("WorkflowException")

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGRollback.groovy
index c26b14e..cac2ad8 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGRollback.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGRollback.groovy
@@ -222,7 +222,7 @@ public class DoCreateAllottedResourceBRGRollback extends AbstractServiceTaskProc
                try {
                        execution.setVariable("rollbackData", null)
                        boolean skipRollback = execution.getVariable("skipRollback")
-                       if (skipRollback != true)
+                       if (!skipRollback)
                        {
                                execution.setVariable("rolledBack", true)
                                utils.log("DEBUG","rolledBack", isDebugEnabled)

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCRollback.groovy
index ff621e5..08f2df2 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCRollback.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCRollback.groovy
@@ -222,7 +222,7 @@ public class DoCreateAllottedResourceTXCRollback extends AbstractServiceTaskProc
                try {
                        execution.setVariable("rollbackData", null)
                        boolean skipRollback = execution.getVariable("skipRollback")
-                       if (skipRollback != true)
+                       if (!skipRollback)
                        {
                                execution.setVariable("rolledBack", true)
                                utils.log("DEBUG","rolledBack", isDebugEnabled)