18 files changed, 289 insertions, 334 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/CamundaRequestHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/CamundaRequestHandler.java
new file mode 100644
index 0000000000..451fa64585
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/CamundaRequestHandler.java
@@ -0,0 +1,180 @@
+package org.onap.so.apihandlerinfra;
+
+import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.xml.bind.DatatypeConverter;
+import org.apache.http.HttpStatus;
+import org.camunda.bpm.engine.impl.persistence.entity.HistoricActivityInstanceEntity;
+import org.camunda.bpm.engine.impl.persistence.entity.HistoricProcessInstanceEntity;
+import org.onap.so.apihandler.common.ErrorNumbers;
+import org.onap.so.apihandlerinfra.exceptions.ContactCamundaException;
+import org.onap.so.utils.CryptoUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.retry.policy.SimpleRetryPolicy;
+import org.springframework.retry.support.RetryTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.ResourceAccessException;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+
+@Component
+public class CamundaRequestHandler {
+
+    private static Logger logger = LoggerFactory.getLogger(CamundaRequestHandler.class);
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Autowired
+    private Environment env;
+
+    public ResponseEntity<List<HistoricProcessInstanceEntity>> getCamundaProcessInstanceHistory(String requestId) {
+        RetryTemplate retryTemplate = setRetryTemplate();
+        String path = env.getProperty("mso.camunda.rest.history.uri") + requestId;
+        String targetUrl = env.getProperty("mso.camundaURL") + path;
+        HttpHeaders headers =
+                setCamundaHeaders(env.getRequiredProperty("mso.camundaAuth"), env.getRequiredProperty("mso.msoKey"));
+
+        HttpEntity<?> requestEntity = new HttpEntity<>(headers);
+
+        return retryTemplate.execute(context -> {
+            if (context.getLastThrowable() != null) {
+                logger.error("Retrying: Last call resulted in exception: ", context.getLastThrowable());
+            }
+            if (context.getRetryCount() == 0) {
+                logger.info("Querying Camunda for process-instance history for requestId: {}", requestId);
+            } else {
+                logger.info("Retry: {} of 3. Querying Camunda for process-instance history for requestId: {}",
+                        context.getRetryCount(), requestId);
+            }
+            return restTemplate.exchange(targetUrl, HttpMethod.GET, requestEntity,
+                    new ParameterizedTypeReference<List<HistoricProcessInstanceEntity>>() {});
+        });
+    }
+
+    protected ResponseEntity<List<HistoricActivityInstanceEntity>> getCamundaActivityHistory(String processInstanceId,
+            String requestId) throws ContactCamundaException {
+        RetryTemplate retryTemplate = setRetryTemplate();
+        String path = env.getProperty("mso.camunda.rest.activity.uri") + processInstanceId;
+        String targetUrl = env.getProperty("mso.camundaURL") + path;
+        HttpHeaders headers =
+                setCamundaHeaders(env.getRequiredProperty("mso.camundaAuth"), env.getRequiredProperty("mso.msoKey"));
+        HttpEntity<?> requestEntity = new HttpEntity<>(headers);
+        try {
+            return retryTemplate.execute(context -> {
+                if (context.getLastThrowable() != null) {
+                    logger.error("Retrying: Last call resulted in exception: ", context.getLastThrowable());
+                }
+                if (context.getRetryCount() == 0) {
+                    logger.info(
+                            "Querying Camunda for activity-instance history for processInstanceId: {}, for requestId: {}",
+                            processInstanceId, requestId);
+                } else {
+                    logger.info(
+                            "Retry: {} of 3. Querying Camunda for activity-instance history for processInstanceId: {}, for requestId: {}",
+                            context.getRetryCount(), processInstanceId, requestId);
+                }
+
+                return restTemplate.exchange(targetUrl, HttpMethod.GET, requestEntity,
+                        new ParameterizedTypeReference<List<HistoricActivityInstanceEntity>>() {});
+            });
+
+        } catch (RestClientException e) {
+            logger.error(
+                    "Error querying Camunda for activity-instance history for processInstanceId: {}, for requestId: {}, exception: {}",
+                    processInstanceId, requestId, e.getMessage());
+            throw new ContactCamundaException.Builder("activity-instance", requestId, e.toString(),
+                    HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).cause(e).build();
+        }
+    }
+
+    protected String getTaskName(String requestId) throws ContactCamundaException {
+        ResponseEntity<List<HistoricProcessInstanceEntity>> response = null;
+        ResponseEntity<List<HistoricActivityInstanceEntity>> activityResponse = null;
+        String processInstanceId = null;
+        try {
+            response = getCamundaProcessInstanceHistory(requestId);
+        } catch (RestClientException e) {
+            logger.error("Error querying Camunda for process-instance history for requestId: {}, exception: {}",
+                    requestId, e.getMessage());
+            throw new ContactCamundaException.Builder("process-instance", requestId, e.toString(),
+                    HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).cause(e).build();
+        }
+
+        List<HistoricProcessInstanceEntity> historicProcessInstanceList = response.getBody();
+
+        if (historicProcessInstanceList != null) {
+            Collections.reverse(historicProcessInstanceList);
+            processInstanceId = historicProcessInstanceList.get(0).getId();
+        } else {
+            return "No processInstances returned for requestId: " + requestId;
+        }
+
+        if (processInstanceId != null) {
+            activityResponse = getCamundaActivityHistory(processInstanceId, requestId);
+        } else {
+            return "No processInstanceId returned for requestId: " + requestId;
+        }
+
+        return getActivityName(activityResponse.getBody());
+    }
+
+    protected String getActivityName(List<HistoricActivityInstanceEntity> activityInstanceList) {
+        String activityName = null;
+        HistoricActivityInstanceEntity activityInstance = null;
+        String result = null;
+
+        if (activityInstanceList == null || activityInstanceList.isEmpty()) {
+            result = "No results returned on activityInstance history lookup.";
+        } else {
+            activityInstance = activityInstanceList.get(0);
+            activityName = activityInstance.getActivityName();
+
+            if (activityName == null) {
+                result = "Task name is null.";
+            } else {
+                result = "Last task executed: " + activityName;
+            }
+        }
+
+        return result;
+    }
+
+    protected HttpHeaders setCamundaHeaders(String auth, String msoKey) {
+        HttpHeaders headers = new HttpHeaders();
+        List<org.springframework.http.MediaType> acceptableMediaTypes = new ArrayList<>();
+        acceptableMediaTypes.add(org.springframework.http.MediaType.APPLICATION_JSON);
+        headers.setAccept(acceptableMediaTypes);
+        try {
+            String userCredentials = CryptoUtils.decrypt(auth, msoKey);
+            if (userCredentials != null) {
+                headers.add(HttpHeaders.AUTHORIZATION,
+                        "Basic " + DatatypeConverter.printBase64Binary(userCredentials.getBytes()));
+            }
+        } catch (GeneralSecurityException e) {
+            logger.error("Security exception", e);
+        }
+        return headers;
+    }
+
+    protected RetryTemplate setRetryTemplate() {
+        RetryTemplate retryTemplate = new RetryTemplate();
+        Map<Class<? extends Throwable>, Boolean> retryableExceptions = new HashMap<>();
+        retryableExceptions.put(ResourceAccessException.class, true);
+        SimpleRetryPolicy policy = new SimpleRetryPolicy(4, retryableExceptions);
+        retryTemplate.setRetryPolicy(policy);
+        return retryTemplate;
+    }
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java
index fdc51ffe24..d3a279fd8e 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java
@@ -92,6 +92,8 @@ public class E2EServiceInstances {
 
     private static final String END_OF_THE_TRANSACTION = "End of the transaction, the final response is: ";
 
+    private static final String SERVICE_ID = "serviceId";
+
     @Autowired
     private MsoRequest msoRequest;
 
@@ -138,9 +140,9 @@ public class E2EServiceInstances {
     public Response updateE2EServiceInstance(String request, @PathParam("version") String version,
             @PathParam("serviceId") String serviceId) throws ApiException {
 
-        instanceIdMap.put("serviceId", serviceId);
+        instanceIdMap.put(SERVICE_ID, serviceId);
 
-        return updateE2EserviceInstances(request, Action.updateInstance, instanceIdMap, version);
+        return updateE2EserviceInstances(request, Action.updateInstance, version);
     }
 
     /**
@@ -155,9 +157,9 @@ public class E2EServiceInstances {
     @Produces(MediaType.APPLICATION_JSON)
     @ApiOperation(value = "Delete E2E Service Instance on a specified version and serviceId", response = Response.class)
     public Response deleteE2EServiceInstance(String request, @PathParam("version") String version,
-            @PathParam("serviceId") String serviceId) throws ApiException {
+            @PathParam(SERVICE_ID) String serviceId) throws ApiException {
 
-        instanceIdMap.put("serviceId", serviceId);
+        instanceIdMap.put(SERVICE_ID, serviceId);
 
         return deleteE2EserviceInstances(request, Action.deleteInstance, instanceIdMap, version);
     }
@@ -167,7 +169,7 @@ public class E2EServiceInstances {
     @ApiOperation(value = "Find e2eServiceInstances Requests for a given serviceId and operationId",
             response = Response.class)
     @Produces(MediaType.APPLICATION_JSON)
-    public Response getE2EServiceInstances(@PathParam("serviceId") String serviceId,
+    public Response getE2EServiceInstances(@PathParam(SERVICE_ID) String serviceId,
             @PathParam("version") String version, @PathParam("operationId") String operationId) {
         return getE2EServiceInstance(serviceId, operationId, version);
     }
@@ -184,11 +186,11 @@ public class E2EServiceInstances {
     @Produces(MediaType.APPLICATION_JSON)
     @ApiOperation(value = "Scale E2E Service Instance on a specified version", response = Response.class)
     public Response scaleE2EServiceInstance(String request, @PathParam("version") String version,
-            @PathParam("serviceId") String serviceId) throws ApiException {
+            @PathParam(SERVICE_ID) String serviceId) throws ApiException {
 
         logger.debug("------------------scale begin------------------");
-        instanceIdMap.put("serviceId", serviceId);
-        return scaleE2EserviceInstances(request, Action.scaleInstance, instanceIdMap, version);
+        instanceIdMap.put(SERVICE_ID, serviceId);
+        return scaleE2EserviceInstances(request, Action.scaleInstance, version);
     }
 
     /**
@@ -207,7 +209,7 @@ public class E2EServiceInstances {
     public Response compareModelwithTargetVersion(String request, @PathParam("serviceId") String serviceId,
             @PathParam("version") String version) throws ApiException {
 
-        instanceIdMap.put("serviceId", serviceId);
+        instanceIdMap.put(SERVICE_ID, serviceId);
 
         return compareModelwithTargetVersion(request, Action.compareModel, instanceIdMap, version);
     }
@@ -216,7 +218,6 @@ public class E2EServiceInstances {
             HashMap<String, String> instanceIdMap, String version) throws ApiException {
 
         String requestId = UUID.randomUUID().toString();
-        long startTime = System.currentTimeMillis();
 
         CompareModelsRequest e2eCompareModelReq;
 
@@ -237,12 +238,12 @@ public class E2EServiceInstances {
             return response;
         }
 
-        return runCompareModelBPMWorkflow(e2eCompareModelReq, requestJSON, requestId, startTime, action, version);
+        return runCompareModelBPMWorkflow(e2eCompareModelReq, requestJSON, requestId, action, version);
 
     }
 
     private Response runCompareModelBPMWorkflow(CompareModelsRequest e2eCompareModelReq, String requestJSON,
-            String requestId, long startTime, Action action, String version) throws ApiException {
+            String requestId, Action action, String version) throws ApiException {
 
         // Define RecipeLookupResult info here instead of query DB for efficiency
         String workflowUrl = "/mso/async/services/CompareModelofE2EServiceInstance";
@@ -251,8 +252,6 @@ public class E2EServiceInstances {
         RequestClient requestClient;
         HttpResponse response;
 
-        long subStartTime = System.currentTimeMillis();
-
         try {
             requestClient = requestClientFactory.getRequestClient(workflowUrl);
 
@@ -261,7 +260,7 @@ public class E2EServiceInstances {
 
             // Capture audit event
             logger.debug("MSO API Handler Posting call to BPEL engine for url: " + requestClient.getUrl());
-            String serviceId = instanceIdMap.get("serviceId");
+            String serviceId = instanceIdMap.get(SERVICE_ID);
             String serviceType = e2eCompareModelReq.getServiceType();
             RequestClientParameter postParam = new RequestClientParameter.Builder().setRequestId(requestId)
                     .setBaseVfModule(false).setRecipeTimeout(recipeTimeout).setRequestAction(action.name())
@@ -291,8 +290,7 @@ public class E2EServiceInstances {
         ResponseHandler respHandler = new ResponseHandler(response, requestClient.getType());
         int bpelStatus = respHandler.getStatus();
 
-        return beplStatusUpdate(requestId, startTime, requestClient, respHandler, bpelStatus, action, instanceIdMap,
-                version);
+        return beplStatusUpdate(requestClient, respHandler, bpelStatus, version);
     }
 
     private Response getE2EServiceInstance(String serviceId, String operationId, String version) {
@@ -301,8 +299,6 @@ public class E2EServiceInstances {
 
         String apiVersion = version.substring(1);
 
-        long startTime = System.currentTimeMillis();
-
         OperationStatus operationStatus;
 
         try {
@@ -339,7 +335,6 @@ public class E2EServiceInstances {
     private Response deleteE2EserviceInstances(String requestJSON, Action action, HashMap<String, String> instanceIdMap,
             String version) throws ApiException {
         // TODO should be a new one or the same service instance Id
-        long startTime = System.currentTimeMillis();
         E2EServiceInstanceDeleteRequest e2eDelReq;
 
         ObjectMapper mapper = new ObjectMapper();
@@ -392,7 +387,6 @@ public class E2EServiceInstances {
         RequestClient requestClient;
         HttpResponse response;
 
-        long subStartTime = System.currentTimeMillis();
         try {
             requestClient = requestClientFactory.getRequestClient(recipeLookupResult.getOrchestrationURI());
 
@@ -403,7 +397,7 @@ public class E2EServiceInstances {
 
             // Capture audit event
             logger.debug("MSO API Handler Posting call to BPEL engine for url: " + requestClient.getUrl());
-            String serviceId = instanceIdMap.get("serviceId");
+            String serviceId = instanceIdMap.get(SERVICE_ID);
             String serviceInstanceType = e2eDelReq.getServiceType();
             RequestClientParameter clientParam = new RequestClientParameter.Builder().setRequestId(requestId)
                     .setBaseVfModule(false).setRecipeTimeout(recipeLookupResult.getRecipeTimeout())
@@ -436,17 +430,14 @@ public class E2EServiceInstances {
         ResponseHandler respHandler = new ResponseHandler(response, requestClient.getType());
         int bpelStatus = respHandler.getStatus();
 
-        return beplStatusUpdate(requestId, startTime, requestClient, respHandler, bpelStatus, action, instanceIdMap,
-                version);
+        return beplStatusUpdate(requestClient, respHandler, bpelStatus, version);
     }
 
-    private Response updateE2EserviceInstances(String requestJSON, Action action, HashMap<String, String> instanceIdMap,
-            String version) throws ApiException {
+    private Response updateE2EserviceInstances(String requestJSON, Action action, String version) throws ApiException {
 
         String requestId = UUID.randomUUID().toString();
-        long startTime = System.currentTimeMillis();
         E2EServiceInstanceRequest e2eSir;
-        String serviceId = instanceIdMap.get("serviceId");
+        String serviceId = instanceIdMap.get(SERVICE_ID);
 
         ObjectMapper mapper = new ObjectMapper();
         try {
@@ -513,7 +504,6 @@ public class E2EServiceInstances {
         RequestClient requestClient;
         HttpResponse response;
 
-        long subStartTime = System.currentTimeMillis();
         String sirRequestJson = convertToString(sir);
 
         try {
@@ -554,15 +544,13 @@ public class E2EServiceInstances {
         ResponseHandler respHandler = new ResponseHandler(response, requestClient.getType());
         int bpelStatus = respHandler.getStatus();
 
-        return beplStatusUpdate(serviceId, startTime, requestClient, respHandler, bpelStatus, action, instanceIdMap,
-                version);
+        return beplStatusUpdate(requestClient, respHandler, bpelStatus, version);
     }
 
     private Response processE2EserviceInstances(String requestJSON, Action action,
             HashMap<String, String> instanceIdMap, String version) throws ApiException {
 
         String requestId = UUID.randomUUID().toString();
-        long startTime = System.currentTimeMillis();
         E2EServiceInstanceRequest e2eSir;
 
         MsoRequest msoRequest = new MsoRequest();
@@ -625,11 +613,10 @@ public class E2EServiceInstances {
 
         String serviceInstanceType = e2eSir.getService().getServiceType();
 
-        String serviceId = "";
+        String serviceId = e2eSir.getService().getServiceId();
         RequestClient requestClient;
         HttpResponse response;
 
-        long subStartTime = System.currentTimeMillis();
         String sirRequestJson = convertToString(sir);
 
         try {
@@ -668,15 +655,12 @@ public class E2EServiceInstances {
         ResponseHandler respHandler = new ResponseHandler(response, requestClient.getType());
         int bpelStatus = respHandler.getStatus();
 
-        return beplStatusUpdate(requestId, startTime, requestClient, respHandler, bpelStatus, action, instanceIdMap,
-                version);
+        return beplStatusUpdate(requestClient, respHandler, bpelStatus, version);
     }
 
-    private Response scaleE2EserviceInstances(String requestJSON, Action action, HashMap<String, String> instanceIdMap,
-            String version) throws ApiException {
+    private Response scaleE2EserviceInstances(String requestJSON, Action action, String version) throws ApiException {
 
         String requestId = UUID.randomUUID().toString();
-        long startTime = System.currentTimeMillis();
         E2EServiceInstanceScaleRequest e2eScaleReq;
 
         ObjectMapper mapper = new ObjectMapper();
@@ -728,7 +712,6 @@ public class E2EServiceInstances {
         RequestClient requestClient;
         HttpResponse response;
 
-        long subStartTime = System.currentTimeMillis();
         try {
             requestClient = requestClientFactory.getRequestClient(recipeLookupResult.getOrchestrationURI());
 
@@ -739,7 +722,7 @@ public class E2EServiceInstances {
 
             // Capture audit event
             logger.debug("MSO API Handler Posting call to BPEL engine for url: " + requestClient.getUrl());
-            String serviceId = instanceIdMap.get("serviceId");
+            String serviceId = instanceIdMap.get(SERVICE_ID);
             String serviceInstanceType = e2eScaleReq.getService().getServiceType();
             RequestClientParameter postParam = new RequestClientParameter.Builder().setRequestId(requestId)
                     .setBaseVfModule(false).setRecipeTimeout(recipeLookupResult.getRecipeTimeout())
@@ -772,12 +755,10 @@ public class E2EServiceInstances {
         ResponseHandler respHandler = new ResponseHandler(response, requestClient.getType());
         int bpelStatus = respHandler.getStatus();
 
-        return beplStatusUpdate(requestId, startTime, requestClient, respHandler, bpelStatus, action, instanceIdMap,
-                version);
+        return beplStatusUpdate(requestClient, respHandler, bpelStatus, version);
     }
 
-    private Response beplStatusUpdate(String serviceId, long startTime, RequestClient requestClient,
-            ResponseHandler respHandler, int bpelStatus, Action action, HashMap<String, String> instanceIdMap,
+    private Response beplStatusUpdate(RequestClient requestClient, ResponseHandler respHandler, int bpelStatus,
             String version) {
 
         String apiVersion = version.substring(1);
@@ -876,7 +857,6 @@ public class E2EServiceInstances {
 
         ServiceInstancesRequest sir = new ServiceInstancesRequest();
 
-        String returnString = null;
         RequestDetails requestDetails = new RequestDetails();
         ModelInfo modelInfo = new ModelInfo();
 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/InstanceManagement.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/InstanceManagement.java
index d8a7cb3f5d..ade13e7b57 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/InstanceManagement.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/InstanceManagement.java
@@ -105,13 +105,9 @@ public class InstanceManagement {
     private Response processCustomWorkflowRequest(String requestJSON, Actions action,
             HashMap<String, String> instanceIdMap, String version, String requestId,
             ContainerRequestContext requestContext) throws ApiException {
-        String serviceInstanceId = null;
-        if (instanceIdMap != null) {
-            serviceInstanceId = instanceIdMap.get("serviceInstanceId");
-        }
+        String serviceInstanceId;
         Boolean aLaCarte = true;
-        long startTime = System.currentTimeMillis();
-        ServiceInstancesRequest sir = null;
+        ServiceInstancesRequest sir;
         String apiVersion = version.substring(1);
 
         String requestUri = requestHandlerUtils.getRequestUri(requestContext, uriPrefix);
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManualTasks.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManualTasks.java
index 113baf96e6..b9b7fcc0d4 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManualTasks.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManualTasks.java
@@ -50,8 +50,6 @@ import org.onap.so.apihandlerinfra.tasksbeans.TaskRequestReference;
 import org.onap.so.apihandlerinfra.tasksbeans.TasksRequest;
 import org.onap.so.apihandlerinfra.tasksbeans.Value;
 import org.onap.so.apihandlerinfra.tasksbeans.Variables;
-import org.onap.so.constants.Status;
-import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.exceptions.ValidationException;
 import org.onap.so.logger.ErrorCode;
 import org.onap.so.logger.MessageEnum;
@@ -94,7 +92,6 @@ public class ManualTasks {
 
         String requestId = requestContext.getProperty("requestId").toString();
         logger.info(LoggingAnchor.TWO, MessageEnum.APIH_GENERATED_REQUEST_ID.toString(), requestId);
-        long startTime = System.currentTimeMillis();
         logger.debug("requestId is: {}", requestId);
         TasksRequest taskRequest = null;
         String apiVersion = version.substring(1);
@@ -141,9 +138,6 @@ public class ManualTasks {
             throw validateException;
 
         }
-        // Create Request Record
-        InfraActiveRequests currentActiveReq =
-                msoRequest.createRequestObject(taskRequest, Action.completeTask, requestId, Status.PENDING, request);
 
         // Transform the request to Camunda-style Complete request
         Variables variablesForComplete = new Variables();
@@ -157,7 +151,7 @@ public class ManualTasks {
         variablesForComplete.setResponseValue(responseValue);
         variablesForComplete.setRequestorId(requestorIdValue);
 
-        String camundaJsonReq = null;
+        String camundaJsonReq;
         try {
             ObjectMapper mapper = new ObjectMapper();
             mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true);
@@ -176,9 +170,8 @@ public class ManualTasks {
             throw validateException;
         }
 
-        RequestClient requestClient = null;
-        HttpResponse response = null;
-        long subStartTime = System.currentTimeMillis();
+        RequestClient requestClient;
+        HttpResponse response;
         String requestUrl = taskUri + "/" + taskId + "/complete";
         try {
             requestClient = reqClientFactory.getRequestClient(requestUrl);
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java
index ba69355d5e..6f36fb2aff 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java
@@ -46,6 +46,7 @@ import org.apache.http.HttpStatus;
 import org.onap.so.apihandler.common.ErrorNumbers;
 import org.onap.so.apihandler.common.ResponseBuilder;
 import org.onap.so.apihandlerinfra.exceptions.ApiException;
+import org.onap.so.apihandlerinfra.exceptions.ContactCamundaException;
 import org.onap.so.apihandlerinfra.exceptions.ValidateException;
 import org.onap.so.apihandlerinfra.logging.ErrorLoggerInfo;
 import org.onap.so.constants.OrchestrationRequestFormat;
@@ -91,6 +92,9 @@ public class OrchestrationRequests {
     @Autowired
     private ResponseBuilder builder;
 
+    @Autowired
+    private CamundaRequestHandler camundaRequestHandler;
+
     @GET
     @Path("/{version:[vV][4-7]}/{requestId}")
     @ApiOperation(value = "Find Orchestrated Requests for a given requestId", response = Response.class)
@@ -165,13 +169,11 @@ public class OrchestrationRequests {
             @QueryParam("includeCloudRequest") boolean includeCloudRequest, @QueryParam(value = "format") String format)
             throws ApiException {
 
-        long startTime = System.currentTimeMillis();
-
         MultivaluedMap<String, String> queryParams = ui.getQueryParameters();
 
-        List<InfraActiveRequests> activeRequests = null;
+        List<InfraActiveRequests> activeRequests;
 
-        GetOrchestrationListResponse orchestrationList = null;
+        GetOrchestrationListResponse orchestrationList;
         Map<String, List<String>> orchestrationMap;
         String apiVersion = version.substring(1);
 
@@ -222,12 +224,10 @@ public class OrchestrationRequests {
     public Response unlockOrchestrationRequest(String requestJSON, @PathParam("requestId") String requestId,
             @PathParam("version") String version) throws ApiException {
 
-        long startTime = System.currentTimeMillis();
         logger.debug("requestId is: {}", requestId);
-        ServiceInstancesRequest sir = null;
+        ServiceInstancesRequest sir;
 
-        InfraActiveRequests infraActiveRequest = null;
-        Request request = null;
+        InfraActiveRequests infraActiveRequest;
 
         try {
             ObjectMapper mapper = new ObjectMapper();
@@ -428,10 +428,19 @@ public class OrchestrationRequests {
     }
 
     protected void mapRequestStatusAndExtSysErrSrcToRequest(InfraActiveRequests iar, RequestStatus status,
-            String format) {
+            String format) throws ContactCamundaException {
         String rollbackStatusMessage = iar.getRollbackStatusMessage();
         String flowStatusMessage = iar.getFlowStatus();
         String retryStatusMessage = iar.getRetryStatusMessage();
+        String taskName = null;
+
+        if (flowStatusMessage != null && !flowStatusMessage.equals("Successfully completed all Building Blocks")
+                && !flowStatusMessage.equals("All Rollback flows have completed successfully")) {
+            taskName = camundaRequestHandler.getTaskName(iar.getRequestId());
+            if (taskName != null) {
+                flowStatusMessage = flowStatusMessage + " TASK INFORMATION: " + taskName;
+            }
+        }
 
         String statusMessages = null;
         if (iar.getStatusMessage() != null) {
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java
index c3f323459c..9ab95a2319 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java
@@ -27,7 +27,6 @@ package org.onap.so.apihandlerinfra;
 import static org.onap.so.logger.HttpHeadersConstants.REQUESTOR_ID;
 import java.io.IOException;
 import java.net.URL;
-import java.security.GeneralSecurityException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -37,7 +36,6 @@ import java.util.Optional;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
-import javax.xml.bind.DatatypeConverter;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
@@ -78,21 +76,16 @@ import org.onap.so.serviceinstancebeans.RelatedInstanceList;
 import org.onap.so.serviceinstancebeans.RequestParameters;
 import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
 import org.onap.so.serviceinstancebeans.ServiceInstancesResponse;
-import org.onap.so.utils.CryptoUtils;
 import org.onap.so.utils.UUIDChecker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.env.Environment;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.HttpStatusCodeException;
-import org.springframework.web.client.RestTemplate;
+import org.springframework.web.client.RestClientException;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -119,7 +112,7 @@ public class RequestHandlerUtils extends AbstractRestHandler {
     private MsoRequest msoRequest;
 
     @Autowired
-    private RestTemplate restTemplate;
+    private CamundaRequestHandler camundaRequestHandler;
 
     @Autowired
     private CatalogDbClient catalogDbClient;
@@ -323,25 +316,20 @@ public class RequestHandlerUtils extends AbstractRestHandler {
     public boolean camundaHistoryCheck(InfraActiveRequests duplicateRecord, InfraActiveRequests currentActiveReq)
             throws RequestDbFailureException, ContactCamundaException {
         String requestId = duplicateRecord.getRequestId();
-        String path = env.getProperty("mso.camunda.rest.history.uri") + requestId;
-        String targetUrl = env.getProperty("mso.camundaURL") + path;
-        HttpHeaders headers =
-                setCamundaHeaders(env.getRequiredProperty("mso.camundaAuth"), env.getRequiredProperty("mso.msoKey"));
-        HttpEntity<?> requestEntity = new HttpEntity<>(headers);
         ResponseEntity<List<HistoricProcessInstanceEntity>> response = null;
         try {
-            response = restTemplate.exchange(targetUrl, HttpMethod.GET, requestEntity,
-                    new ParameterizedTypeReference<List<HistoricProcessInstanceEntity>>() {});
-        } catch (HttpStatusCodeException e) {
-            ErrorLoggerInfo errorLoggerInfo =
-                    new ErrorLoggerInfo.Builder(MessageEnum.APIH_DUPLICATE_CHECK_EXC, ErrorCode.DataError)
-                            .errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
+            response = camundaRequestHandler.getCamundaProcessInstanceHistory(requestId);
+        } catch (RestClientException e) {
+            logger.error("Error querying Camunda for process-instance history for requestId: {}, exception: {}",
+                    requestId, e.getMessage());
             ContactCamundaException contactCamundaException =
-                    new ContactCamundaException.Builder(requestId, e.toString(), HttpStatus.SC_INTERNAL_SERVER_ERROR,
-                            ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).cause(e).errorInfo(errorLoggerInfo).build();
+                    new ContactCamundaException.Builder("process-instance", requestId, e.toString(),
+                            HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).cause(e)
+                                    .build();
             updateStatus(currentActiveReq, Status.FAILED, contactCamundaException.getMessage());
             throw contactCamundaException;
         }
+
         if (response.getBody().isEmpty()) {
             updateStatus(duplicateRecord, Status.COMPLETE, "Request Completed");
         }
@@ -355,23 +343,6 @@ public class RequestHandlerUtils extends AbstractRestHandler {
         return false;
     }
 
-    protected HttpHeaders setCamundaHeaders(String auth, String msoKey) {
-        HttpHeaders headers = new HttpHeaders();
-        List<org.springframework.http.MediaType> acceptableMediaTypes = new ArrayList<>();
-        acceptableMediaTypes.add(org.springframework.http.MediaType.APPLICATION_JSON);
-        headers.setAccept(acceptableMediaTypes);
-        try {
-            String userCredentials = CryptoUtils.decrypt(auth, msoKey);
-            if (userCredentials != null) {
-                headers.add(HttpHeaders.AUTHORIZATION,
-                        "Basic " + DatatypeConverter.printBase64Binary(userCredentials.getBytes()));
-            }
-        } catch (GeneralSecurityException e) {
-            logger.error("Security exception", e);
-        }
-        return headers;
-    }
-
     public ServiceInstancesRequest convertJsonToServiceInstanceRequest(String requestJSON, Actions action,
             String requestId, String requestUri) throws ApiException {
         try {
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java
index bba8064f7c..b57bb5d1d8 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -91,13 +93,13 @@ public class WorkflowSpecificationsHandler {
         List<Workflow> workflows = catalogDbClient.findWorkflowByModelUUID(vnfModelVersionId);
 
         List<Workflow> nativeWorkflows = catalogDbClient.findWorkflowBySource(NATIVE_WORKFLOW);
-        if (nativeWorkflows != null && nativeWorkflows.size() != 0) {
+        if (nativeWorkflows != null && !nativeWorkflows.isEmpty()) {
             workflows.addAll(nativeWorkflows);
         }
 
         WorkflowSpecifications workflowSpecifications = mapWorkflowsToWorkflowSpecifications(workflows);
 
-        String jsonResponse = null;
+        String jsonResponse;
         try {
             ObjectMapper mapper = new ObjectMapper();
             jsonResponse = mapper.writeValueAsString(workflowSpecifications);
@@ -116,11 +118,11 @@ public class WorkflowSpecificationsHandler {
     }
 
     protected WorkflowSpecifications mapWorkflowsToWorkflowSpecifications(List<Workflow> workflows) {
-        if (workflows == null || workflows.size() == 0) {
+        if (workflows == null || workflows.isEmpty()) {
             return null;
         }
         WorkflowSpecifications workflowSpecifications = new WorkflowSpecifications();
-        List<WorkflowSpecificationList> workflowSpecificationList = new ArrayList<WorkflowSpecificationList>();
+        List<WorkflowSpecificationList> workflowSpecificationList = new ArrayList<>();
 
         for (Workflow workflow : workflows) {
             WorkflowSpecificationList workflowSpecificationListItem = new WorkflowSpecificationList();
@@ -153,10 +155,10 @@ public class WorkflowSpecificationsHandler {
 
     private List<ActivitySequence> buildActivitySequence(Workflow workflow) {
         List<WorkflowActivitySpecSequence> workflowActivitySpecSequences = workflow.getWorkflowActivitySpecSequence();
-        if (workflowActivitySpecSequences == null || workflowActivitySpecSequences.size() == 0) {
+        if (workflowActivitySpecSequences == null || workflowActivitySpecSequences.isEmpty()) {
             return null;
         }
-        List<ActivitySequence> activitySequences = new ArrayList<ActivitySequence>();
+        List<ActivitySequence> activitySequences = new ArrayList<>();
         for (WorkflowActivitySpecSequence workflowActivitySpecSequence : workflowActivitySpecSequences) {
             if (workflowActivitySpecSequence != null) {
                 ActivitySpec activitySpec = workflowActivitySpecSequence.getActivitySpec();
@@ -174,17 +176,17 @@ public class WorkflowSpecificationsHandler {
 
     private List<WorkflowInputParameter> buildWorkflowInputParameters(Workflow workflow) {
         List<WorkflowActivitySpecSequence> workflowActivitySpecSequences = workflow.getWorkflowActivitySpecSequence();
-        if (workflowActivitySpecSequences == null || workflowActivitySpecSequences.size() == 0) {
-            return new ArrayList<WorkflowInputParameter>();
+        if (workflowActivitySpecSequences == null || workflowActivitySpecSequences.isEmpty()) {
+            return new ArrayList<>();
         }
-        Map<String, WorkflowInputParameter> workflowInputParameterMap = new HashMap<String, WorkflowInputParameter>();
+        Map<String, WorkflowInputParameter> workflowInputParameterMap = new HashMap<>();
         for (WorkflowActivitySpecSequence workflowActivitySpecSequence : workflowActivitySpecSequences) {
             if (workflowActivitySpecSequence != null) {
                 ActivitySpec activitySpec = workflowActivitySpecSequence.getActivitySpec();
                 if (activitySpec != null) {
                     List<ActivitySpecUserParameters> activitySpecUserParameters =
                             activitySpec.getActivitySpecUserParameters();
-                    if (activitySpecUserParameters != null && activitySpecUserParameters.size() != 0) {
+                    if (activitySpecUserParameters != null && !activitySpecUserParameters.isEmpty()) {
                         for (ActivitySpecUserParameters activitySpecUserParameter : activitySpecUserParameters) {
                             UserParameters userParameter = activitySpecUserParameter.getUserParameters();
                             if (userParameter != null) {
@@ -199,7 +201,7 @@ public class WorkflowSpecificationsHandler {
         }
 
         if (workflowInputParameterMap.size() == 0) {
-            return new ArrayList<WorkflowInputParameter>();
+            return new ArrayList<>();
         }
         List<WorkflowInputParameter> workflowInputParameterList =
                 workflowInputParameterMap.values().stream().collect(Collectors.toList());
@@ -220,7 +222,7 @@ public class WorkflowSpecificationsHandler {
     private List<Validation> buildValidationList(UserParameters userParameter) {
         List<Validation> validationList = null;
         if (userParameter.getMaxLength() != null || userParameter.getAllowableChars() != null) {
-            validationList = new ArrayList<Validation>();
+            validationList = new ArrayList<>();
             Validation validation = new Validation();
             if (userParameter.getMaxLength() != null) {
                 validation.setMaxLength(userParameter.getMaxLength().toString());
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/E2EService.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/E2EService.java
index f969674ed1..d6a99af8cd 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/E2EService.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/e2eserviceinstancebeans/E2EService.java
@@ -47,6 +47,9 @@ public class E2EService {
     @JsonProperty("serviceType")
     private String serviceType;
 
+    @JsonProperty("serviceId")
+    private String serviceId;
+
     @JsonProperty("parameters")
     private E2EParameters parameters;
 
@@ -109,6 +112,14 @@ public class E2EService {
         this.serviceType = serviceType;
     }
 
+    public String getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(String serviceId) {
+        this.serviceId = serviceId;
+    }
+
     public String getServiceUuid() {
         return serviceUuid;
     }
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/Network.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/Network.java
index c44f1f0e0a..ec3df21fdb 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/Network.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/Network.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -38,8 +40,6 @@ import org.onap.so.db.catalog.beans.Recipe;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
 import org.onap.so.serviceinstancebeans.ServiceInstancesResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -50,8 +50,6 @@ import io.swagger.annotations.ApiOperation;
 @Path("/onap/so/infra/serviceInstantiation")
 public class Network {
 
-    private static Logger logger = LoggerFactory.getLogger(Network.class);
-
     @Autowired
     private NetworkRestHandler networkRestHandler;
 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/ServiceInstance.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/ServiceInstance.java
index bf10fcc183..07e8092449 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/ServiceInstance.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/ServiceInstance.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -38,8 +40,6 @@ import org.onap.so.db.catalog.beans.Recipe;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
 import org.onap.so.serviceinstancebeans.ServiceInstancesResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -50,8 +50,6 @@ import io.swagger.annotations.ApiOperation;
 @Path("/onap/so/infra/serviceInstantiation")
 public class ServiceInstance {
 
-    private static Logger logger = LoggerFactory.getLogger(ServiceInstance.class);
-
     @Autowired
     private ServiceInstanceRestHandler requestHandler;
 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/VfModules.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/VfModules.java
index 1a2688f0b3..1b9eb1f802 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/VfModules.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/VfModules.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -39,8 +41,6 @@ import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.serviceinstancebeans.ModelType;
 import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
 import org.onap.so.serviceinstancebeans.ServiceInstancesResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -51,8 +51,6 @@ import io.swagger.annotations.ApiOperation;
 @Path("/onap/so/infra/serviceInstantiation")
 public class VfModules {
 
-    private static Logger logger = LoggerFactory.getLogger(VfModules.class);
-
     @Autowired
     private VFModuleRestHandler restHandler;
 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/Vnf.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/Vnf.java
index b161713a71..a8ccdeecac 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/Vnf.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/Vnf.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -37,8 +39,6 @@ import org.onap.so.db.catalog.beans.Recipe;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
 import org.onap.so.serviceinstancebeans.ServiceInstancesResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -49,8 +49,6 @@ import io.swagger.annotations.ApiOperation;
 @Path("/onap/so/infra/serviceInstantiation")
 public class Vnf {
 
-    private static Logger logger = LoggerFactory.getLogger(Vnf.class);
-
     @Autowired
     private BpmnRequestBuilder requestBuilder;
 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/Volumes.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/Volumes.java
index afabdd9c60..d3e394d6d8 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/Volumes.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/Volumes.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -40,8 +42,6 @@ import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.serviceinstancebeans.ModelType;
 import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
 import org.onap.so.serviceinstancebeans.ServiceInstancesResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -52,8 +52,6 @@ import io.swagger.annotations.ApiOperation;
 @Path("/onap/so/infra/serviceInstantiation")
 public class Volumes {
 
-    private static Logger logger = LoggerFactory.getLogger(Volumes.class);
-
     @Autowired
     private BpmnRequestBuilder requestBuilder;
 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/CloudResourcesOrchestration.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/CloudResourcesOrchestration.java
index 20e8fed32d..e9cd303c0b 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/CloudResourcesOrchestration.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/CloudResourcesOrchestration.java
@@ -88,9 +88,9 @@ public class CloudResourcesOrchestration {
     public Response unlockOrchestrationRequest(String requestJSON, @PathParam("requestId") String requestId,
             @PathParam("version") String version) throws ApiException {
         TenantIsolationRequest msoRequest = new TenantIsolationRequest(requestId);
-        InfraActiveRequests infraActiveRequest = null;
+        InfraActiveRequests infraActiveRequest;
 
-        CloudOrchestrationRequest cor = null;
+        CloudOrchestrationRequest cor;
 
         logger.debug("requestId is: {}", requestId);
 
@@ -140,8 +140,8 @@ public class CloudResourcesOrchestration {
 
         } else {
             String status = infraActiveRequest.getRequestStatus();
-            if (status.equalsIgnoreCase("IN_PROGRESS") || status.equalsIgnoreCase("PENDING")
-                    || status.equalsIgnoreCase("PENDING_MANUAL_TASK")) {
+            if ("IN_PROGRESS".equalsIgnoreCase(status) || "PENDING".equalsIgnoreCase(status)
+                    || "PENDING_MANUAL_TASK".equalsIgnoreCase(status)) {
                 infraActiveRequest.setRequestStatus("UNLOCKED");
                 infraActiveRequest.setLastModifiedBy(Constants.MODIFIED_BY_APIHANDLER);
                 infraActiveRequest.setRequestId(requestId);
@@ -181,8 +181,7 @@ public class CloudResourcesOrchestration {
             String requestId = requestIdKey.get(0);
 
             CloudOrchestrationResponse cloudOrchestrationGetResponse = new CloudOrchestrationResponse();
-            TenantIsolationRequest tenantIsolationRequest = new TenantIsolationRequest(requestId);
-            InfraActiveRequests requestDB = null;
+            InfraActiveRequests requestDB;
 
             try {
                 requestDB = requestDbClient.getInfraActiveRequestbyRequestId(requestId);
@@ -213,8 +212,8 @@ public class CloudResourcesOrchestration {
 
         } else {
             TenantIsolationRequest tenantIsolationRequest = new TenantIsolationRequest();
-            List<InfraActiveRequests> activeRequests = null;
-            CloudOrchestrationRequestList orchestrationList = null;
+            List<InfraActiveRequests> activeRequests;
+            CloudOrchestrationRequestList orchestrationList;
 
 
             Map<String, String> orchestrationMap;
@@ -233,7 +232,7 @@ public class CloudResourcesOrchestration {
             }
             activeRequests = requestDbClient.getCloudOrchestrationFiltersFromInfraActive(orchestrationMap);
             orchestrationList = new CloudOrchestrationRequestList();
-            List<CloudOrchestrationResponse> requestLists = new ArrayList<CloudOrchestrationResponse>();
+            List<CloudOrchestrationResponse> requestLists = new ArrayList<>();
 
             for (InfraActiveRequests infraActive : activeRequests) {
 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/ModelDistributionRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/ModelDistributionRequest.java
index b2933df030..216588432b 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/ModelDistributionRequest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/ModelDistributionRequest.java
@@ -75,8 +75,7 @@ public class ModelDistributionRequest {
     @Transactional
     public Response updateModelDistributionStatus(String requestJSON, @PathParam("version") String version,
             @PathParam("distributionId") String distributionId) throws ApiException {
-        long startTime = System.currentTimeMillis();
-        Distribution distributionRequest = null;
+        Distribution distributionRequest;
 
         try {
             ObjectMapper mapper = new ObjectMapper();
@@ -146,7 +145,7 @@ public class ModelDistributionRequest {
         }
         re.setServiceException(se);
 
-        String requestErrorStr = null;
+        String requestErrorStr;
         try {
             ObjectMapper mapper = new ObjectMapper();
             mapper.setSerializationInclusion(Include.NON_DEFAULT);
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateVnfOperationalEnvironment.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateVnfOperationalEnvironment.java
index fe81a07212..5eb4a67fa6 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateVnfOperationalEnvironment.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateVnfOperationalEnvironment.java
@@ -145,7 +145,7 @@ public class CreateVnfOperationalEnvironment {
             throws TenantIsolationException {
         List<ServiceEndPoint> endpointList = serviceEndPointList.getServiceEndPointList();
         logger.debug("Number of service endpoints from GRM: {}", endpointList.size());
-        List<ServiceEndPointRequest> serviceEndPointRequestList = new ArrayList<ServiceEndPointRequest>();
+        List<ServiceEndPointRequest> serviceEndPointRequestList = new ArrayList<>();
         for (ServiceEndPoint serviceEndpoint : endpointList) {
             serviceEndPointRequestList.add(buildServiceEndpoint(serviceEndpoint));
         }
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/resources/application-local.yaml b/mso-api-handlers/mso-api-handler-infra/src/main/resources/application-local.yaml
deleted file mode 100644
index a39d28038c..0000000000
--- a/mso-api-handlers/mso-api-handler-infra/src/main/resources/application-local.yaml
+++ /dev/null
@@ -1,179 +0,0 @@
-# will be used as entry in DB to say SITE OFF/ON for healthcheck
-
-server:
-    port: 8080
-    tomcat:
-        max-threads: 50
-ssl-enable: false
-
-apih-healthcheck-urn: /ecomp/mso/healthcheck,/ecomp/mso/homing/healthcheck,/ecomp/mso/infra/healthcheck,/asdc/healthcheck,/dbadapters/healthcheck,/ecomp/mso/catalog/v2/healthcheck
-jra-healthcheck-urn: /networks/rest/healthcheck,/adapters/rest/healthcheck,/vnfs/rest/healthcheck,/tenants/rest/healthcheck,/appc/rest/healthcheck,/workflows/messages/healthcheck
-camunda-healthcheck-urn: /mso/healthcheck
-
-apih-nodehealthcheck-urn: /ecomp/mso/infra/nodehealthcheck
-jra-nodehealthcheck-urn: /adapters/rest/nodehealthcheck
-camunda-nodehealthcheck-urn: /mso/nodehealthcheck
-
-
-
-mso:
-  health:
-    endpoints:
-      catalogdb: http://localhost:8800
-      sdnc: http://localhost:8400
-      openstack: http://localhost:8300
-      requestdb: http://localhost:8700
-      bpmn: http://localhost:8200
-      asdc: http://localhost:8400
-      requestdbattsvc: http://localhost:8600
-      
-  adapters:
-    requestDb:
-      auth: Basic YnBlbDptc28tZGItMTUwNyE=
-      endpoint: http://localhost:8081
-  logPath: logs
-  site-name: mtanj
-  catalog:
-    db:
-      spring:
-        endpoint: "http://localhost:8080"
-  db:
-    auth: Basic YnBlbDptc28tZGItMTUwNyE=
-  config: 
-    path: /src/main/resources/
-  infra:
-    default:
-      alacarte:
-        orchestrationUri: /mso/async/services/ALaCarteOrchestrator
-        recipeTimeout: 180
-        testApi: VNF_API
-      service:
-        macro:
-          default:
-            testApi: GR_API
-  apih:
-    homing:
-      sdna:
-        url: http://localhost:8089/
-        password: 4E0BDC08EE8EDC0572ABBE9FD2D59B62DB725A00B8469E39393D6C86D64284C5D34A57D56F7B58C375316F
-  camundaURL: http://localhost:8089/
-  camundaAuth: E8E19DD16CC90D2E458E8FF9A884CC0452F8F3EB8E321F96038DE38D5C1B0B02DFAE00B88E2CF6E2A4101AB2C011FC161212EE
-  async:
-    core-pool-size: 50
-    max-pool-size: 50
-    queue-capacity: 500
-  sdc:
-    client:
-      auth: 97FF88AB352DA16E00DDD81E3876431DEF8744465DACA489EB3B3BE1F10F63EDA1715E626D0A4827A3E19CD88421BF
-    activate:
-      instanceid: test
-      userid: cs0008
-    endpoint: http://localhost:28090
-  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
-  tenant:
-    isolation:
-      retry:
-        count: 3
-  aai:
-    endpoint: http://localhost:28090
-    auth: 5E12ACACBD552A415E081E29F2C4772F9835792A51C766CCFDD7433DB5220B59969CB2798C
-  grm:
-    endpoint: http://localhost:28090
-    username: gmruser
-    password: test
-  so:
-    operational-environment:
-      dmaap:
-        username: testuser
-        password: VjR5NDcxSzA=
-        host: http://localhost:28090
-      publisher:
-        topic: com.att.ecomp.mso.operationalEnvironmentEvent
-
-# controls what actions the infra API (APIH) allows sent in on REST request
-vnf:
-  v1:
-    ApiAllowableActions: 
-  v2:
-    ApiAllowableActions: 
-  v3:
-    ApiAllowableActions: 
-  
-network:
-  v1:
-    ApiAllowableActions: 
-  v2:
-    ApiAllowableActions: 
-  v3:
-    ApiAllowableActions: 
-  
-volume:
-  v1:
-    ApiAllowableActions: 
-  v2:
-    ApiAllowableActions: 
-  v3:
-    ApiAllowableActions: 
-
-# H2
-spring:
-  datasource:
-    url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-    username: sa
-    password: sa
-    driver-class-name: org.h2.Driver
-    intialize: true
-  h2:
-    console:
-      enabled: true
-      path: /h2
-
-  jpa:
-      show-sql: true
-      hibernate:
-        dialect: org.hibernate.dialect.H2Dialect
-        ddl-auto: validate
-        naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
-        enable_lazy_load_no_trans: true
-  jersey:
-    type: filter
-  security:
-    usercredentials:
-    -  
-      username: sitecontrol
-      password: '$2a$12$VBUF.qBmeK1FNyO2MqTpD.P2M1tvlesZlhCkAjjHvF9hmYNVdMDmu'
-      role: SiteControl-Client 
-    -  
-      username: gui
-      password: '$2a$12$9Y4daXavh.oX5fz6t/e7TuCdj7EKW5B5ibqq425fN3/xpp0/Fhyti'
-      role: GUI-Client  
-    -  
-      username: infraportal
-      password: '$2a$12$IpUEhQijWTNbq0fGYVkA9upZrDvdIK6QfblIaKAiwi0vBQRE.C6Ri'
-      role: InfraPortal-Client        
-    -  
-      username: bpel
-      password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO'
-      role: BPEL-Client   
-    -  
-      username: mso_admin
-      password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa'
-      role: ACTUATOR      
-request:
-  datasource:
-    url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-    username: sa
-    password: sa
-    driver-class-name: org.h2.Driver
-    intialize: true 
-
-#Actuator
-management: 
-  context-path: /manage
-
-org:
-  onap:
-    so:
-      adapters:
-        network:
-          encryptionKey: aa3871669d893c7fb8abbcda31b88b4f
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml b/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
index 136acfb9e1..93a4ae9489 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
@@ -26,6 +26,10 @@ mso:
         uri: /sobpmnengine/task
       history:
         uri: /sobpmnengine/history/process-instance?variables=mso-request-id_eq_
+      activity:
+        uri: /sobpmnengine/history/activity-instance?processInstanceId=
+  camundaURL: http://localhost:8089
+  camundaAuth: E8E19DD16CC90D2E458E8FF9A884CC0452F8F3EB8E321F96038DE38D5C1B0B02DFAE00B88E2CF6E2A4101AB2C011FC161212EE
                 
 spring:
   datasource: