[MSO-8] Second step of the rebase for MSO

Second rebase containing additional features for MSO + total reworking
of the BPMN structure + Notification flow can now be added at the end of
some BPMN flows

Change-Id: I7e937c7a0ba1593ca85e164a093f79c7e38b6ce0
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

1 files changed, 36 insertions, 36 deletions

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.java
index 00e52ab7e4..71fddd83b3 100644
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.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.
@@ -44,53 +44,53 @@ public class CamundaVIDRequest {
 
 	@JsonProperty(CommonConstants.CAMUNDA_SERVICE_INPUT)
 	private CamundaInput serviceInput;
-	
+
 	@JsonProperty(CommonConstants.CAMUNDA_HOST)
 	private CamundaInput host;
-	
+
 	@JsonProperty(CommonConstants.REQUEST_ID_VARIABLE)
 	private CamundaInput requestId;
-	
+
 	@JsonProperty(CommonConstants.REQUEST_ID_HEADER)
 	private CamundaInput msoRequestId;
-	
-	
+
+
 	@JsonProperty(CommonConstants.IS_BASE_VF_MODULE_VARIABLE)
 	private CamundaBooleanInput isBaseVfModule;
-	
+
 	@JsonProperty(CommonConstants.RECIPE_TIMEOUT_VARIABLE)
 	private CamundaIntegerInput recipeTimeout;
-	
+
 	@JsonProperty(CommonConstants.REQUEST_ACTION_VARIABLE)
 	private CamundaInput requestAction;
-	
+
 	@JsonProperty(CommonConstants.SERVICE_INSTANCE_ID_VARIABLE)
 	private CamundaInput serviceInstanceId;
-	
+
 	@JsonProperty(CommonConstants.VNF_ID_VARIABLE)
 	private CamundaInput vnfId;
-	
+
 	@JsonProperty(CommonConstants.VF_MODULE_ID_VARIABLE)
 	private CamundaInput vfModuleId;
-	
+
 	@JsonProperty(CommonConstants.VOLUME_GROUP_ID_VARIABLE)
 	private CamundaInput volumeGroupId;
-	
+
 	@JsonProperty(CommonConstants.NETWORK_ID_VARIABLE)
 	private CamundaInput networkId;
-	
+
 	@JsonProperty(CommonConstants.SERVICE_TYPE_VARIABLE)
 	private CamundaInput serviceType;
-	
+
 	@JsonProperty(CommonConstants.VNF_TYPE_VARIABLE)
 	private CamundaInput vnfType;
-	
+
 	@JsonProperty(CommonConstants.VF_MODULE_TYPE_VARIABLE)
 	private CamundaInput vfModuleType;
-	
+
 	@JsonProperty(CommonConstants.NETWORK_TYPE_VARIABLE)
 	private CamundaInput networkType;
-	
+
 	@JsonProperty(CommonConstants.CAMUNDA_SERVICE_INPUT)
 	public CamundaInput getServiceInput() {
 		return serviceInput;
@@ -100,7 +100,7 @@ public class CamundaVIDRequest {
 	public void setServiceInput(CamundaInput serviceInput) {
 		this.serviceInput = serviceInput;
 	}
-	
+
 	@JsonProperty(CommonConstants.CAMUNDA_HOST)
 	public CamundaInput getHost() {
 		return host;
@@ -120,7 +120,7 @@ public class CamundaVIDRequest {
 	public void setRequestId(CamundaInput requestId) {
 		this.requestId = requestId;
 	}
-	
+
 	@JsonProperty(CommonConstants.REQUEST_ID_HEADER)
 	public CamundaInput getMsoRequestId() {
 		return msoRequestId;
@@ -130,7 +130,7 @@ public class CamundaVIDRequest {
 	public void setMsoRequestId(CamundaInput msoRequestIdp) {
 		this.msoRequestId = msoRequestIdp;
 	}
-	
+
 	@JsonProperty(CommonConstants.IS_BASE_VF_MODULE_VARIABLE)
 	public CamundaBooleanInput getIsBaseVfModule() {
 		return isBaseVfModule;
@@ -140,7 +140,7 @@ public class CamundaVIDRequest {
 	public void setIsBaseVfModule(CamundaBooleanInput isBaseVfModule) {
 		this.isBaseVfModule = isBaseVfModule;
 	}
-	
+
 	@JsonProperty(CommonConstants.RECIPE_TIMEOUT_VARIABLE)
 	public CamundaIntegerInput getRecipeTimeout() {
 		return recipeTimeout;
@@ -150,7 +150,7 @@ public class CamundaVIDRequest {
 	public void setRecipeTimeout(CamundaIntegerInput recipeTimeout) {
 		this.recipeTimeout = recipeTimeout;
 	}
-	
+
 	@JsonProperty(CommonConstants.REQUEST_ACTION_VARIABLE)
 	public CamundaInput getRequestAction() {
 		return requestAction;
@@ -169,7 +169,7 @@ public class CamundaVIDRequest {
 	public void setServiceInstanceId(CamundaInput serviceInstanceId) {
 		this.serviceInstanceId = serviceInstanceId;
 	}
-	
+
 	@JsonProperty(CommonConstants.VNF_ID_VARIABLE)
 	public CamundaInput getVnfId() {
 		return vnfId;
@@ -179,7 +179,7 @@ public class CamundaVIDRequest {
 	public void setVnfId(CamundaInput vnfId) {
 		this.vnfId = vnfId;
 	}
-	
+
 	@JsonProperty(CommonConstants.VF_MODULE_ID_VARIABLE)
 	public CamundaInput getVfModuleId() {
 		return vfModuleId;
@@ -189,7 +189,7 @@ public class CamundaVIDRequest {
 	public void setVfModuleId(CamundaInput vfModuleId) {
 		this.vfModuleId = vfModuleId;
 	}
-	
+
 	@JsonProperty(CommonConstants.VOLUME_GROUP_ID_VARIABLE)
 	public CamundaInput getVolumeGroupId() {
 		return volumeGroupId;
@@ -199,7 +199,7 @@ public class CamundaVIDRequest {
 	public void setVolumeGroupId(CamundaInput volumeGroupId) {
 		this.volumeGroupId = volumeGroupId;
 	}
-	
+
 	@JsonProperty(CommonConstants.NETWORK_ID_VARIABLE)
 	public CamundaInput getNetworkId() {
 		return networkId;
@@ -209,7 +209,7 @@ public class CamundaVIDRequest {
 	public void setNetworkId(CamundaInput networkId) {
 		this.networkId = networkId;
 	}
-	
+
 	@JsonProperty(CommonConstants.SERVICE_TYPE_VARIABLE)
 	public CamundaInput getServiceType() {
 		return serviceType;
@@ -219,7 +219,7 @@ public class CamundaVIDRequest {
 	public void setServiceType(CamundaInput serviceType) {
 		this.serviceType = serviceType;
 	}
-	
+
 	@JsonProperty(CommonConstants.VNF_TYPE_VARIABLE)
 	public CamundaInput getVnfType() {
 		return vnfType;
@@ -229,7 +229,7 @@ public class CamundaVIDRequest {
 	public void setVnfType(CamundaInput vnfType) {
 		this.vnfType = vnfType;
 	}
-	
+
 	@JsonProperty(CommonConstants.VF_MODULE_TYPE_VARIABLE)
 	public CamundaInput getVfModuleType() {
 		return vfModuleType;
@@ -239,7 +239,7 @@ public class CamundaVIDRequest {
 	public void setVfModuleType(CamundaInput vfModuleType) {
 		this.vfModuleType = vfModuleType;
 	}
-	
+
 	@JsonProperty(CommonConstants.NETWORK_TYPE_VARIABLE)
 	public CamundaInput getNetworkType() {
 		return networkType;
@@ -249,14 +249,14 @@ public class CamundaVIDRequest {
 	public void setNetworkType(CamundaInput networkType) {
 		this.networkType = networkType;
 	}
-		
-	
+
+
 	@Override
 	public String toString() {
 		//return "CamundaRequest [requestId=" +  + ", host="
 		//		+ host + ", schema=" + schema + ", reqid=" + reqid + ", svcid="
 			//	+ svcid + ", timeout=" + timeout + "]";
 		return "CamundaRequest";
-	}	
-	
+	}
+
 }