diff options
Diffstat (limited to 'mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans')
8 files changed, 44 insertions, 32 deletions
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/BpmnRequest.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/BpmnRequest.java index 27a310fd2d..e4db35bcca 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/BpmnRequest.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/BpmnRequest.java @@ -20,12 +20,12 @@ package org.openecomp.mso.apihandler.camundabeans; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; -import org.codehaus.jackson.annotate.JsonPropertyOrder; - import org.openecomp.mso.apihandler.common.CommonConstants; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonRootName; + /** * JavaBean JSON class for a "bpmnRequest" which contains the JSON payload that * will be passed to the Camunda process diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBooleanInput.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBooleanInput.java index b7d2b614e9..4c25bf78cf 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBooleanInput.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBooleanInput.java @@ -20,11 +20,10 @@ package org.openecomp.mso.apihandler.camundabeans; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; - import org.openecomp.mso.apihandler.common.CommonConstants; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * JavaBean JSON class for a "gMyServiceInput" which contains the xml payload that * will be passed to the Camunda process diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBpmnRequestInput.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBpmnRequestInput.java index f73829688c..62f09d175a 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBpmnRequestInput.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBpmnRequestInput.java @@ -20,10 +20,10 @@ package org.openecomp.mso.apihandler.camundabeans; -import org.codehaus.jackson.annotate.JsonProperty; - import org.openecomp.mso.apihandler.common.CommonConstants; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * JavaBean JSON class for a "gMyServiceInput" which contains the xml payload that * will be passed to the Camunda process diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaInput.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaInput.java index 0c69a76b14..1eff5275a2 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaInput.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaInput.java @@ -21,10 +21,10 @@ package org.openecomp.mso.apihandler.camundabeans; -import org.codehaus.jackson.annotate.JsonProperty; - import org.openecomp.mso.apihandler.common.CommonConstants; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * JavaBean JSON class for a "gMyServiceInput" which contains the xml payload that * will be passed to the Camunda process diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaIntegerInput.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaIntegerInput.java index 7b593b49d0..d3039c496d 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaIntegerInput.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaIntegerInput.java @@ -20,11 +20,10 @@ package org.openecomp.mso.apihandler.camundabeans; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; - import org.openecomp.mso.apihandler.common.CommonConstants; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * JavaBean JSON class for a "gMyServiceInput" which contains the xml payload that * will be passed to the Camunda process diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaRequest.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaRequest.java index d73ba3882b..60a9efe9b6 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaRequest.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaRequest.java @@ -22,12 +22,12 @@ package org.openecomp.mso.apihandler.camundabeans; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; -import org.codehaus.jackson.annotate.JsonPropertyOrder; - import org.openecomp.mso.apihandler.common.CommonConstants; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonRootName; + /** * JavaBean JSON class for a "variables" which contains the xml payload that * will be passed to the Camunda process diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaResponse.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaResponse.java index b7b5a11bd6..3c5c5ecb1d 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaResponse.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaResponse.java @@ -21,7 +21,7 @@ package org.openecomp.mso.apihandler.camundabeans; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** * JavaBean JSON class for a "variables" which contains the xml payload that 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 3ef6d4974c..faa669133f 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 @@ -20,12 +20,12 @@ package org.openecomp.mso.apihandler.camundabeans; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonRootName; -import org.codehaus.jackson.annotate.JsonPropertyOrder; - import org.openecomp.mso.apihandler.common.CommonConstants; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonRootName; + /** * JavaBean JSON class for a "variables" which contains the JSON payload that * will be passed to the Camunda process @@ -36,8 +36,9 @@ import org.openecomp.mso.apihandler.common.CommonConstants; CommonConstants.REQUEST_ACTION_VARIABLE, CommonConstants.SERVICE_INSTANCE_ID_VARIABLE, CommonConstants.VNF_ID_VARIABLE, CommonConstants.VF_MODULE_ID_VARIABLE, CommonConstants.VOLUME_GROUP_ID_VARIABLE, CommonConstants.NETWORK_ID_VARIABLE, - CommonConstants.SERVICE_TYPE_VARIABLE, CommonConstants.VNF_TYPE_VARIABLE, - CommonConstants.VF_MODULE_TYPE_VARIABLE, CommonConstants.NETWORK_TYPE_VARIABLE, + CommonConstants.CONFIGURATION_ID_VARIABLE, CommonConstants.SERVICE_TYPE_VARIABLE, + CommonConstants.VNF_TYPE_VARIABLE, CommonConstants.VF_MODULE_TYPE_VARIABLE, + CommonConstants.NETWORK_TYPE_VARIABLE, CommonConstants.CAMUNDA_SERVICE_INPUT, CommonConstants.CAMUNDA_SERVICE_INPUT, CommonConstants.RECIPE_PARAMS}) @JsonRootName(CommonConstants.CAMUNDA_ROOT_INPUT) public class CamundaVIDRequest { @@ -79,6 +80,9 @@ public class CamundaVIDRequest { @JsonProperty(CommonConstants.NETWORK_ID_VARIABLE) private CamundaInput networkId; + @JsonProperty(CommonConstants.CONFIGURATION_ID_VARIABLE) + private CamundaInput configurationId; + @JsonProperty(CommonConstants.SERVICE_TYPE_VARIABLE) private CamundaInput serviceType; @@ -213,6 +217,16 @@ public class CamundaVIDRequest { this.networkId = networkId; } + @JsonProperty(CommonConstants.CONFIGURATION_ID_VARIABLE) + public CamundaInput getConfigurationId() { + return configurationId; + } + + @JsonProperty(CommonConstants.CONFIGURATION_ID_VARIABLE) + public void setConfigurationId(CamundaInput configurationId) { + this.configurationId = configurationId; + } + @JsonProperty(CommonConstants.SERVICE_TYPE_VARIABLE) public CamundaInput getServiceType() { return serviceType; @@ -254,16 +268,16 @@ public class CamundaVIDRequest { } @JsonProperty(CommonConstants.RECIPE_PARAMS) - public CamundaInput getRecipeParams() { - return recipeParams; - } + public CamundaInput getRecipeParams() { + return recipeParams; + } @JsonProperty(CommonConstants.RECIPE_PARAMS) - public void setRecipeParams(CamundaInput recipeParams) { - this.recipeParams = recipeParams; - } + public void setRecipeParams(CamundaInput recipeParams) { + this.recipeParams = recipeParams; + } - @Override + @Override public String toString() { //return "CamundaRequest [requestId=" + + ", host=" // + host + ", schema=" + schema + ", reqid=" + reqid + ", svcid=" |