diff options
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/main')
4 files changed, 51 insertions, 36 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/BuildingBlock.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/BuildingBlock.java index c1591ad984..aa1d845ef8 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/BuildingBlock.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/BuildingBlock.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("buildingBlock") public class BuildingBlock implements Serializable { - private static final long serialVersionUID = -1144315411128866052L; + private static final long serialVersionUID = -1144315411128866053L; @JsonProperty("mso-id") private String msoId; @@ -48,56 +48,62 @@ public class BuildingBlock implements Serializable { return bpmnFlowName; } - public void setBpmnFlowName(String bpmnFlowName) { + public BuildingBlock setBpmnFlowName(String bpmnFlowName) { this.bpmnFlowName = bpmnFlowName; + return this; } public String getMsoId() { return msoId; } - public void setMsoId(String msoId) { + public BuildingBlock setMsoId(String msoId) { this.msoId = msoId; + return this; } public String getKey() { return key; } - public void setKey(String key) { + public BuildingBlock setKey(String key) { this.key = key; + return this; } - public Boolean getIsVirtualLink() { + public Boolean isVirtualLink() { return isVirtualLink; } - public void setIsVirtualLink(Boolean isVirtualLink) { + public BuildingBlock setIsVirtualLink(Boolean isVirtualLink) { this.isVirtualLink = isVirtualLink; + return this; } public String getVirtualLinkKey() { return virtualLinkKey; } - public void setVirtualLinkKey(String virtualLinkKey) { + public BuildingBlock setVirtualLinkKey(String virtualLinkKey) { this.virtualLinkKey = virtualLinkKey; + return this; } public String getBpmnScope() { return bpmnScope; } - public void setBpmnScope(String scope) { + public BuildingBlock setBpmnScope(String scope) { this.bpmnScope = scope; + return this; } public String getBpmnAction() { return bpmnAction; } - public void setBpmnAction(String action) { + public BuildingBlock setBpmnAction(String action) { this.bpmnAction = action; + return this; } - } 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 f1de0cc6f6..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 @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,10 +24,8 @@ import java.io.Serializable; import org.onap.so.serviceinstancebeans.RequestDetails; public class ExecuteBuildingBlock implements Serializable { - /** - * - */ - private static final long serialVersionUID = 1L; + + private static final long serialVersionUID = 2L; private BuildingBlock buildingBlock; private String requestId; private String apiVersion; @@ -44,87 +42,98 @@ public class ExecuteBuildingBlock implements Serializable { return buildingBlock; } - public void setBuildingBlock(BuildingBlock buildingBlock) { + public ExecuteBuildingBlock setBuildingBlock(BuildingBlock buildingBlock) { this.buildingBlock = buildingBlock; + return this; } public String getRequestId() { return requestId; } - public void setRequestId(String requestId) { + public ExecuteBuildingBlock setRequestId(String requestId) { this.requestId = requestId; + return this; } public String getApiVersion() { return apiVersion; } - public void setApiVersion(String apiVersion) { + public ExecuteBuildingBlock setApiVersion(String apiVersion) { this.apiVersion = apiVersion; + return this; } public String getResourceId() { return resourceId; } - public void setResourceId(String resourceId) { + public ExecuteBuildingBlock setResourceId(String resourceId) { this.resourceId = resourceId; + return this; } public String getRequestAction() { return requestAction; } - public void setRequestAction(String requestAction) { + public ExecuteBuildingBlock setRequestAction(String requestAction) { this.requestAction = requestAction; + return this; } public Boolean isaLaCarte() { return aLaCarte; } - public void setaLaCarte(Boolean aLaCarte) { + public ExecuteBuildingBlock setaLaCarte(Boolean aLaCarte) { this.aLaCarte = aLaCarte; + return this; } public String getVnfType() { return vnfType; } - public void setVnfType(String 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 void setWorkflowResourceIds(WorkflowResourceIds workflowResourceIds) { + public ExecuteBuildingBlock setWorkflowResourceIds(WorkflowResourceIds workflowResourceIds) { this.workflowResourceIds = workflowResourceIds; + return this; } public RequestDetails getRequestDetails() { return requestDetails; } - public void setRequestDetails(RequestDetails 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; } } diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java index ac66fb1a41..8293cbc10e 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java @@ -1189,7 +1189,7 @@ public class BBInputSetup implements JavaDelegate { if (bbName.contains(NETWORK) && !bbName.contains(NETWORK_COLLECTION)) { String networkId = lookupKeyMap.get(ResourceKey.NETWORK_ID); ModelInfo networkModelInfo = new ModelInfo(); - if ((!Boolean.TRUE.equals(executeBB.getBuildingBlock().getIsVirtualLink()))) { + if ((!Boolean.TRUE.equals(executeBB.getBuildingBlock().isVirtualLink()))) { NetworkResourceCustomization networkCust = getNetworkCustomizationByKey(key, service); if (networkCust != null) { networkModelInfo.setModelCustomizationUuid(networkCust.getModelCustomizationUUID()); diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java index ea48c78dc0..28ec71b13f 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java @@ -22,12 +22,6 @@ package org.onap.so.bpmn.servicedecomposition.tasks; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; import org.modelmapper.ModelMapper; import org.modelmapper.convention.MatchingStrategies; import org.onap.so.bpmn.servicedecomposition.bbobjects.AggregateRoute; @@ -92,6 +86,12 @@ import org.onap.so.serviceinstancebeans.RequestDetails; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; @Component("BBInputSetupMapperLayer") public class BBInputSetupMapperLayer { |