Merge "WorkflowAction refactoring"

1 files changed, 14 insertions, 10 deletions

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
index fe45e1385e..ac33d7ad08 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
@@ -213,17 +213,8 @@ public class WorkflowAction {
                         orchFlows = queryNorthBoundRequestCatalogDb(execution, requestAction, resourceType, true,
                                 cloudOwner, serviceType);
                     }
-                    String key = "";
-                    ModelInfo modelInfo = sIRequest.getRequestDetails().getModelInfo();
-                    if (modelInfo != null) {
-                        if (modelInfo.getModelType().equals(ModelType.service)) {
-                            key = modelInfo.getModelVersionId();
-                        } else {
-                            key = modelInfo.getModelCustomizationId();
-                        }
-                    }
+                    Resource resourceKey = getResourceKey(sIRequest, resourceType);
                     boolean isConfiguration = isConfiguration(orchFlows);
-                    Resource resourceKey = new Resource(resourceType, key, true);
                     if (isConfiguration && !requestAction.equalsIgnoreCase(CREATEINSTANCE)) {
                         List<ExecuteBuildingBlock> configBuildingBlocks = getConfigBuildingBlocks(
                                 new ConfigBuildingBlocksDataObject().setsIRequest(sIRequest).setOrchFlows(orchFlows)
@@ -408,6 +399,19 @@ public class WorkflowAction {
         }
     }
 
+    private Resource getResourceKey(ServiceInstancesRequest sIRequest, WorkflowType resourceType) {
+        String resourceId = "";
+        ModelInfo modelInfo = sIRequest.getRequestDetails().getModelInfo();
+        if (modelInfo != null) {
+            if (modelInfo.getModelType().equals(ModelType.service)) {
+                resourceId = modelInfo.getModelVersionId();
+            } else {
+                resourceId = modelInfo.getModelCustomizationId();
+            }
+        }
+        return new Resource(resourceType, resourceId, true);
+    }
+
     private String getCloudOwner(CloudConfiguration cloudConfiguration) {
         if (cloudConfiguration != null && cloudConfiguration.getCloudOwner() != null) {
             return cloudConfiguration.getCloudOwner();