diff options
Diffstat (limited to 'activiti-extension/src/main')
8 files changed, 143 insertions, 83 deletions
diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/EnumModuleUrl.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/EnumModuleUrl.java index efc4dff..a380ffd 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/EnumModuleUrl.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/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. diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/Parameter.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/Parameter.java index 6aa97a0..bbb8c7c 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/Parameter.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/Parameter.java @@ -1,28 +1,20 @@ /** - * 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. You may obtain a copy of the License at + * 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 + * 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. See the License for the specific language governing permissions and limitations under - * the License. + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.onap.workflow.activitiext.common; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonIgnoreProperties(ignoreUnknown = true) public class Parameter { private String position; @@ -30,4 +22,35 @@ public class Parameter { private String name; private String value; private String valueSource; + public String getPosition() { + return position; + } + public void setPosition(String position) { + this.position = position; + } + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + 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; + } + public String getValueSource() { + return valueSource; + } + public void setValueSource(String valueSource) { + this.valueSource = valueSource; + } + } diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/RestInfo.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/RestInfo.java index 18c376b..16e28f1 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/RestInfo.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/common/RestInfo.java @@ -15,16 +15,6 @@ */ package org.onap.workflow.activitiext.common; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonIgnoreProperties(ignoreUnknown = true) public class RestInfo { private String name; @@ -36,5 +26,59 @@ public class RestInfo { private String contentType; private String requestBody; private String realUri; + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getVersion() { + return version; + } + public void setVersion(String version) { + this.version = version; + } + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } + public String getPath() { + return path; + } + public void setPath(String path) { + this.path = path; + } + public String getMethod() { + return method; + } + public void setMethod(String method) { + this.method = method; + } + public String getAccept() { + return accept; + } + public void setAccept(String accept) { + this.accept = accept; + } + public String getContentType() { + return contentType; + } + public void setContentType(String contentType) { + this.contentType = contentType; + } + public String getRequestBody() { + return requestBody; + } + public void setRequestBody(String requestBody) { + this.requestBody = requestBody; + } + public String getRealUri() { + return realUri; + } + public void setRealUri(String realUri) { + this.realUri = realUri; + } } diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HighLevelRestApi.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HighLevelRestApi.java index cd8517b..268443a 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HighLevelRestApi.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HighLevelRestApi.java @@ -186,7 +186,7 @@ public class HighLevelRestApi { return responseMessage; } - private static void setAcceptHeader(HttpMethodBase method, String value) { + public static void setAcceptHeader(HttpMethodBase method, String value) { if (StringUtils.isNotEmpty(value)) { if(value.startsWith("[")&&value.endsWith("]")){ value = value.substring(1, value.length()-1); @@ -196,7 +196,7 @@ public class HighLevelRestApi { } } - private static void setContentTypeHeader(HttpMethodBase method, String value) { + public static void setContentTypeHeader(HttpMethodBase method, String value) { if (StringUtils.isNotEmpty(value)) { if(value.startsWith("[")&&value.endsWith("]")){ value = value.substring(1, value.length()-1); diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpResponseMessage.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpResponseMessage.java index ac80b50..ebe2735 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpResponseMessage.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpResponseMessage.java @@ -1,15 +1,17 @@ /** - * 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. You may obtain a copy of the License at + * 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 + * 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. See the License for the specific language governing permissions and limitations under - * the License. + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.onap.workflow.activitiext.restservicetask; @@ -17,39 +19,24 @@ import java.io.Serializable; import com.alibaba.fastjson.JSON; -/** - */ public class HttpResponseMessage implements Serializable { - + private int statusCode; private JSON responseBody; - - - /** - * @return the statusCode - */ + public int getStatusCode() { - return this.statusCode; + return statusCode; } - - /** - * @param statusCode the statusCode to set - */ - protected void setStatusCode(int statusCode) { + + public void setStatusCode(int statusCode) { this.statusCode = statusCode; } - - /** - * @return the responseBody - */ + public JSON getResponseBody() { - return this.responseBody; + return responseBody; } - - /** - * @param responseBody the responseBody to set - */ - protected void setResponseBody(JSON responseBody) { + + public void setResponseBody(JSON responseBody) { this.responseBody = responseBody; } @@ -57,5 +44,5 @@ public class HttpResponseMessage implements Serializable { public String toString() { return "{statusCode=" + statusCode + ", responseBody=" + responseBody.toJSONString() + "}"; } - + } diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpUtil.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpUtil.java index 0acab5f..ea84ce3 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpUtil.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/HttpUtil.java @@ -76,7 +76,7 @@ public class HttpUtil implements JavaDelegate { *
* @param execution
*/
- public void executeMethod(DelegateExecution execution) throws Exception {
+ public boolean executeMethod(DelegateExecution execution) throws Exception {
// get rest task information
RestInfo restInfo = new RestInfo();
@@ -108,6 +108,8 @@ public class HttpUtil implements JavaDelegate { // inject the result to variable
execution.setVariable(execution.getCurrentActivityId(), msg);
+
+ return true;
}
/**
@@ -306,7 +308,7 @@ public class HttpUtil implements JavaDelegate { * @param restInfo
* @return
*/
- private static String compeleteUri(RestInfo restInfo) {
+ public static String compeleteUri(RestInfo restInfo) {
String publishUrl = "";
try {
@@ -333,7 +335,7 @@ public class HttpUtil implements JavaDelegate { * @param expStr
* @return
*/
- private static Queue<String> parseExpressionToQueue(String expStr) {
+ public static Queue<String> parseExpressionToQueue(String expStr) {
Queue<String> queue = new LinkedList<String>();
diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/LowLevelRestApi.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/LowLevelRestApi.java index 25dc873..b3303bd 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/LowLevelRestApi.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/LowLevelRestApi.java @@ -1,15 +1,17 @@ /** - * 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. You may obtain a copy of the License at + * 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 + * 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. See the License for the specific language governing permissions and limitations under - * the License. + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.onap.workflow.activitiext.restservicetask; diff --git a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/PropertyUtil.java b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/PropertyUtil.java index 48e2ab6..ff4c30a 100644 --- a/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/PropertyUtil.java +++ b/activiti-extension/src/main/java/org/onap/workflow/activitiext/restservicetask/PropertyUtil.java @@ -1,15 +1,17 @@ /**
- * 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. You may obtain a copy of the License at
+ * 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
+ * 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. See the License for the specific language governing permissions and limitations under
- * the License.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.onap.workflow.activitiext.restservicetask;
|