Merge "Workflow refactoring - revert changes"

2 files changed, 90 insertions, 96 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/BuildingBlockBase.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/BuildingBlockBase.java
deleted file mode 100644
index 9e320700bd..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/BuildingBlockBase.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.onap.so.bpmn.servicedecomposition.entities;
-
-import org.onap.so.serviceinstancebeans.RequestDetails;
-
-public class BuildingBlockBase {
-
-    private Boolean aLaCarte;
-    private String apiVersion;
-    private Boolean isResume;
-    private String resourceId;
-    private String requestId;
-    private String requestAction;
-    private RequestDetails requestDetails;
-    private WorkflowResourceIds workflowResourceIds;
-    private String vnfType;
-
-    public void setaLaCarte(Boolean aLaCarte) {
-        this.aLaCarte = aLaCarte;
-    }
-
-    public void setApiVersion(String apiVersion) {
-        this.apiVersion = apiVersion;
-    }
-
-    public void setResume(Boolean resume) {
-        isResume = resume;
-    }
-
-    public void setResourceId(String resourceId) {
-        this.resourceId = resourceId;
-    }
-
-    public void setRequestId(String requestId) {
-        this.requestId = requestId;
-    }
-
-    public void setRequestAction(String requestAction) {
-        this.requestAction = requestAction;
-    }
-
-    public void setRequestDetails(RequestDetails requestDetails) {
-        this.requestDetails = requestDetails;
-    }
-
-    public void setWorkflowResourceIds(WorkflowResourceIds workflowResourceIds) {
-        this.workflowResourceIds = workflowResourceIds;
-    }
-
-    public void setVnfType(String vnfType) {
-        this.vnfType = vnfType;
-    }
-
-    public Boolean isResume() {
-        return isResume;
-    }
-
-    public String getRequestId() {
-        return requestId;
-    }
-
-    public String getApiVersion() {
-        return apiVersion;
-    }
-
-    public String getResourceId() {
-        return resourceId;
-    }
-
-    public String getRequestAction() {
-        return requestAction;
-    }
-
-    public Boolean isaLaCarte() {
-        return aLaCarte;
-    }
-
-    public String getVnfType() {
-        return vnfType;
-    }
-
-    public WorkflowResourceIds getWorkflowResourceIds() {
-        return workflowResourceIds;
-    }
-
-    public RequestDetails getRequestDetails() {
-        return requestDetails;
-    }
-
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java
index 9274e0659e..abd301fa4d 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java
@@ -21,36 +21,119 @@
 package org.onap.so.bpmn.servicedecomposition.entities;
 
 import java.io.Serializable;
+import org.onap.so.serviceinstancebeans.RequestDetails;
 
-public class ExecuteBuildingBlock extends BuildingBlockBase implements Serializable {
+public class ExecuteBuildingBlock implements Serializable {
 
+    private static final long serialVersionUID = 2L;
     private BuildingBlock buildingBlock;
-    private ConfigurationResourceKeys configurationResourceKeys;
+    private String requestId;
+    private String apiVersion;
+    private String resourceId;
+    private String requestAction;
+    private String vnfType;
+    private Boolean aLaCarte;
     private Boolean homing = false;
-    private static final long serialVersionUID = 3L;
+    private WorkflowResourceIds workflowResourceIds;
+    private RequestDetails requestDetails;
+    private ConfigurationResourceKeys configurationResourceKeys;
 
     public BuildingBlock getBuildingBlock() {
         return buildingBlock;
     }
 
-    public void setBuildingBlock(BuildingBlock buildingBlock) {
+    public ExecuteBuildingBlock setBuildingBlock(BuildingBlock buildingBlock) {
         this.buildingBlock = buildingBlock;
+        return this;
+    }
+
+    public String getRequestId() {
+        return requestId;
+    }
+
+    public ExecuteBuildingBlock setRequestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    public String getApiVersion() {
+        return apiVersion;
+    }
+
+    public ExecuteBuildingBlock setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+        return this;
+    }
+
+    public String getResourceId() {
+        return resourceId;
+    }
+
+    public ExecuteBuildingBlock setResourceId(String resourceId) {
+        this.resourceId = resourceId;
+        return this;
+    }
+
+    public String getRequestAction() {
+        return requestAction;
+    }
+
+    public ExecuteBuildingBlock setRequestAction(String requestAction) {
+        this.requestAction = requestAction;
+        return this;
+    }
+
+    public Boolean isaLaCarte() {
+        return aLaCarte;
+    }
+
+    public ExecuteBuildingBlock setaLaCarte(Boolean aLaCarte) {
+        this.aLaCarte = aLaCarte;
+        return this;
+    }
+
+    public String getVnfType() {
+        return vnfType;
+    }
+
+    public ExecuteBuildingBlock setVnfType(String vnfType) {
+        this.vnfType = vnfType;
+        return this;
     }
 
     public Boolean isHoming() {
         return homing;
     }
 
-    public void setHoming(Boolean homing) {
+    public ExecuteBuildingBlock setHoming(Boolean homing) {
         this.homing = homing;
+        return this;
+    }
+
+    public WorkflowResourceIds getWorkflowResourceIds() {
+        return workflowResourceIds;
+    }
+
+    public ExecuteBuildingBlock setWorkflowResourceIds(WorkflowResourceIds workflowResourceIds) {
+        this.workflowResourceIds = workflowResourceIds;
+        return this;
+    }
+
+    public RequestDetails getRequestDetails() {
+        return requestDetails;
+    }
+
+    public ExecuteBuildingBlock setRequestDetails(RequestDetails requestDetails) {
+        this.requestDetails = requestDetails;
+        return this;
     }
 
     public ConfigurationResourceKeys getConfigurationResourceKeys() {
         return configurationResourceKeys;
     }
 
-    public void setConfigurationResourceKeys(ConfigurationResourceKeys configurationResourceKeys) {
+    public ExecuteBuildingBlock setConfigurationResourceKeys(ConfigurationResourceKeys configurationResourceKeys) {
         this.configurationResourceKeys = configurationResourceKeys;
+        return this;
     }
-
 }