1 files changed, 47 insertions, 45 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/DeactivateVnfOperationalEnvironment.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/DeactivateVnfOperationalEnvironment.java
index 7f8b330727..e8ea153a6a 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/DeactivateVnfOperationalEnvironment.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/DeactivateVnfOperationalEnvironment.java
@@ -23,7 +23,6 @@
 package org.onap.so.apihandlerinfra.tenantisolation.process;
 
 import java.util.Optional;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import org.onap.aai.domain.yang.OperationalEnvironment;
@@ -45,50 +44,53 @@ import org.springframework.stereotype.Component;
 @Component
 public class DeactivateVnfOperationalEnvironment {
 
-	private static Logger logger = LoggerFactory.getLogger(DeactivateVnfOperationalEnvironment
-		.class);
-	
-    @Autowired 
+    private static Logger logger = LoggerFactory.getLogger(DeactivateVnfOperationalEnvironment.class);
+
+    @Autowired
     private AAIClientHelper aaiHelper;
-    @Autowired 
+    @Autowired
     private RequestsDBHelper requestDb;
-	
-	public void execute(String requestId, CloudOrchestrationRequest request) throws ApiException {
-		String operationalEnvironmentId = request.getOperationalEnvironmentId();
-		
-		OperationalEnvironment aaiOpEnv = getAAIOperationalEnvironment(operationalEnvironmentId);
-		if (aaiOpEnv != null) {
-			String operationalEnvironmentStatus = aaiOpEnv.getOperationalEnvironmentStatus();
-	
-			if(StringUtils.isBlank(operationalEnvironmentStatus)) {
-	            String error = "OperationalEnvironmentStatus is null on OperationalEnvironmentId: " + operationalEnvironmentId;
-	            ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_GENERAL_EXCEPTION, ErrorCode.DataError).build();
-	            throw new ValidateException.Builder(error, HttpStatus.SC_BAD_REQUEST, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR)
-	            							.errorInfo(errorLoggerInfo)
-	            							.build();
-			}
-			
-			if(operationalEnvironmentStatus.equalsIgnoreCase("ACTIVE")) {
-	
-				aaiOpEnv.setOperationalEnvironmentStatus("INACTIVE");
-				aaiHelper.updateAaiOperationalEnvironment(operationalEnvironmentId, aaiOpEnv);
-				
-			} else if(!operationalEnvironmentStatus.equalsIgnoreCase("INACTIVE")) {
-	            String error = "Invalid OperationalEnvironmentStatus on OperationalEnvironmentId: " + operationalEnvironmentId;
-	            ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_GENERAL_EXCEPTION, ErrorCode.DataError).build();
-	            ValidateException validateException = new ValidateException.Builder(error,
-	                    HttpStatus.SC_BAD_REQUEST, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).errorInfo(errorLoggerInfo).build();
-	            requestDb.updateInfraFailureCompletion(error, requestId, operationalEnvironmentId);
-	            throw validateException;
-			}
-			
-			requestDb.updateInfraSuccessCompletion("SUCCESSFULLY Deactivated OperationalEnvironment", requestId, operationalEnvironmentId);
-		}
-	}
-	
-	private OperationalEnvironment getAAIOperationalEnvironment(String operationalEnvironmentId) {
-		AAIResultWrapper aaiResult = aaiHelper.getAaiOperationalEnvironment(operationalEnvironmentId);
-		Optional<OperationalEnvironment> operationalEnvironmentOpt = aaiResult.asBean(OperationalEnvironment.class);
-		return operationalEnvironmentOpt.isPresent() ? operationalEnvironmentOpt.get() : null;
-	}
+
+    public void execute(String requestId, CloudOrchestrationRequest request) throws ApiException {
+        String operationalEnvironmentId = request.getOperationalEnvironmentId();
+
+        OperationalEnvironment aaiOpEnv = getAAIOperationalEnvironment(operationalEnvironmentId);
+        if (aaiOpEnv != null) {
+            String operationalEnvironmentStatus = aaiOpEnv.getOperationalEnvironmentStatus();
+
+            if (StringUtils.isBlank(operationalEnvironmentStatus)) {
+                String error =
+                        "OperationalEnvironmentStatus is null on OperationalEnvironmentId: " + operationalEnvironmentId;
+                ErrorLoggerInfo errorLoggerInfo =
+                        new ErrorLoggerInfo.Builder(MessageEnum.APIH_GENERAL_EXCEPTION, ErrorCode.DataError).build();
+                throw new ValidateException.Builder(error, HttpStatus.SC_BAD_REQUEST,
+                        ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).errorInfo(errorLoggerInfo).build();
+            }
+
+            if (operationalEnvironmentStatus.equalsIgnoreCase("ACTIVE")) {
+
+                aaiOpEnv.setOperationalEnvironmentStatus("INACTIVE");
+                aaiHelper.updateAaiOperationalEnvironment(operationalEnvironmentId, aaiOpEnv);
+
+            } else if (!operationalEnvironmentStatus.equalsIgnoreCase("INACTIVE")) {
+                String error =
+                        "Invalid OperationalEnvironmentStatus on OperationalEnvironmentId: " + operationalEnvironmentId;
+                ErrorLoggerInfo errorLoggerInfo =
+                        new ErrorLoggerInfo.Builder(MessageEnum.APIH_GENERAL_EXCEPTION, ErrorCode.DataError).build();
+                ValidateException validateException = new ValidateException.Builder(error, HttpStatus.SC_BAD_REQUEST,
+                        ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).errorInfo(errorLoggerInfo).build();
+                requestDb.updateInfraFailureCompletion(error, requestId, operationalEnvironmentId);
+                throw validateException;
+            }
+
+            requestDb.updateInfraSuccessCompletion("SUCCESSFULLY Deactivated OperationalEnvironment", requestId,
+                    operationalEnvironmentId);
+        }
+    }
+
+    private OperationalEnvironment getAAIOperationalEnvironment(String operationalEnvironmentId) {
+        AAIResultWrapper aaiResult = aaiHelper.getAaiOperationalEnvironment(operationalEnvironmentId);
+        Optional<OperationalEnvironment> operationalEnvironmentOpt = aaiResult.asBean(OperationalEnvironment.class);
+        return operationalEnvironmentOpt.isPresent() ? operationalEnvironmentOpt.get() : null;
+    }
 }