From b15b381c5fa631699c1a3d27e482d3d77bed6ad8 Mon Sep 17 00:00:00 2001 From: Zhaoxing Date: Sat, 30 Sep 2017 14:08:50 +0800 Subject: Add unit test for vfc-nfvo-wfengine Change-Id: If70f670ce62c3ca577d11b036e705b07a80f82cf Issue-id: VFC-454 Signed-off-by: Zhaoxing --- .../org/onap/workflow/common/EnumModuleUrl.java | 3 ++- .../org/onap/workflow/common/RestResponse.java | 25 +++++++++++------- .../workflow/entity/DeployBpmnFileResponse.java | 30 +++++++++++++++++----- .../org/onap/workflow/entity/MsbClientConfig.java | 16 +++++++++--- .../onap/workflow/entity/StartProcessRequest.java | 22 ++++++++-------- .../activitientitiy/ActivitiDeployResponse.java | 21 +++++++++++++-- .../ActivitiStartProcessRequest.java | 15 +++++++++-- .../ActivitiStartProcessRequestParam.java | 17 +++++++++--- .../org/onap/workflow/tools/RequestParameters.java | 8 ++++-- 9 files changed, 119 insertions(+), 38 deletions(-) (limited to 'wfenginemgrservice/src/main') diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/common/EnumModuleUrl.java b/wfenginemgrservice/src/main/java/org/onap/workflow/common/EnumModuleUrl.java index 00f10d8..120e3de 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/common/EnumModuleUrl.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/common/EnumModuleUrl.java @@ -1,5 +1,5 @@ /** - * Copyright 2017 [ZTE] and others. + * Copyright 2017 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.onap.workflow.common; public enum EnumModuleUrl { diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestResponse.java b/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestResponse.java index 21467bf..f55387b 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestResponse.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestResponse.java @@ -15,17 +15,24 @@ */ package org.onap.workflow.common; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonIgnoreProperties(ignoreUnknown = true) public class RestResponse { + public int getStatusCode() { + return statusCode; + } + + public void setStatusCode(int statusCode) { + this.statusCode = statusCode; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + private int statusCode; private String result; diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/entity/DeployBpmnFileResponse.java b/wfenginemgrservice/src/main/java/org/onap/workflow/entity/DeployBpmnFileResponse.java index 6a1920e..bb6fcbb 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/entity/DeployBpmnFileResponse.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/entity/DeployBpmnFileResponse.java @@ -15,15 +15,33 @@ */ package org.onap.workflow.entity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -@Data -@NoArgsConstructor -@AllArgsConstructor public class DeployBpmnFileResponse { + public int getStatus() { + return status; + } + public void setStatus(int status) { + this.status = status; + } + public String getMessage() { + return message; + } + public void setMessage(String message) { + this.message = message; + } + public String getDeployedId() { + return deployedId; + } + public void setDeployedId(String deployedId) { + this.deployedId = deployedId; + } + public String getProcessId() { + return processId; + } + public void setProcessId(String processId) { + this.processId = processId; + } private int status; private String message; private String deployedId; diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/entity/MsbClientConfig.java b/wfenginemgrservice/src/main/java/org/onap/workflow/entity/MsbClientConfig.java index e73c4f2..4867bd6 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/entity/MsbClientConfig.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/entity/MsbClientConfig.java @@ -16,11 +16,21 @@ package org.onap.workflow.entity; -import lombok.Data; -@Data public class MsbClientConfig { - private String msbSvrIp; + public String getMsbSvrIp() { + return msbSvrIp; + } + public void setMsbSvrIp(String msbSvrIp) { + this.msbSvrIp = msbSvrIp; + } + public Integer getMsbSvrPort() { + return msbSvrPort; + } + public void setMsbSvrPort(Integer msbSvrPort) { + this.msbSvrPort = msbSvrPort; + } + private String msbSvrIp; private Integer msbSvrPort; } diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/entity/StartProcessRequest.java b/wfenginemgrservice/src/main/java/org/onap/workflow/entity/StartProcessRequest.java index cddaa09..3258722 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/entity/StartProcessRequest.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/entity/StartProcessRequest.java @@ -17,17 +17,19 @@ package org.onap.workflow.entity; import java.util.Map; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonIgnoreProperties(ignoreUnknown = true) public class StartProcessRequest { + public String getProcessDefinitionKey() { + return processDefinitionKey; + } + public void setProcessDefinitionKey(String processDefinitionKey) { + this.processDefinitionKey = processDefinitionKey; + } + public Map getParams() { + return params; + } + public void setParams(Map params) { + this.params = params; + } private String processDefinitionKey; private Map params; } diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiDeployResponse.java b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiDeployResponse.java index 5ad3d12..71b3bd0 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiDeployResponse.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiDeployResponse.java @@ -15,10 +15,27 @@ */ package org.onap.workflow.externalservice.entity.activitientitiy; -import lombok.Data; -@Data + public class ActivitiDeployResponse { + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getDeploymentTime() { + return deploymentTime; + } + public void setDeploymentTime(String deploymentTime) { + this.deploymentTime = deploymentTime; + } + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } private String id; private String deploymentTime; private String url; diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequest.java b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequest.java index ae7edf1..a925c2f 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequest.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequest.java @@ -16,10 +16,21 @@ package org.onap.workflow.externalservice.entity.activitientitiy; -import lombok.Data; -@Data + public class ActivitiStartProcessRequest { + public String getProcessDefinitionKey() { + return processDefinitionKey; + } + public void setProcessDefinitionKey(String processDefinitionKey) { + this.processDefinitionKey = processDefinitionKey; + } + public ActivitiStartProcessRequestParam[] getVariables() { + return variables; + } + public void setVariables(ActivitiStartProcessRequestParam[] variables) { + this.variables = variables; + } private String processDefinitionKey; private ActivitiStartProcessRequestParam[] variables; } diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequestParam.java b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequestParam.java index 35dc487..7ca54dd 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequestParam.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/entity/activitientitiy/ActivitiStartProcessRequestParam.java @@ -1,5 +1,5 @@ /** - * Copyright 2017 [ZTE] and others. + * Copyright 2017 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,15 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.onap.workflow.externalservice.entity.activitientitiy; -import lombok.Data; /** * */ -@Data public class ActivitiStartProcessRequestParam { + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getValue() { + return value; + } + public void setValue(String value) { + this.value = value; + } private String name; private String value; } diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/tools/RequestParameters.java b/wfenginemgrservice/src/main/java/org/onap/workflow/tools/RequestParameters.java index b8e76d8..8fc79ff 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/tools/RequestParameters.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/tools/RequestParameters.java @@ -16,15 +16,19 @@ package org.onap.workflow.tools; -import lombok.Data; /** * @author 10175158 * */ -@Data public class RequestParameters { + public boolean isCasCade() { + return casCade; + } + public void setCasCade(boolean casCade) { + this.casCade = casCade; + } protected boolean casCade; @Override public String toString() { -- cgit 1.2.3-korg