summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activiti-extension/src/main/docker/activiti-docker-build_image.sh2
-rw-r--r--activiti-extension/src/main/docker/swagger.json161
-rw-r--r--wfenginemgrservice/src/main/java/org/onap/workflow/common/RestClient.java2
3 files changed, 164 insertions, 1 deletions
diff --git a/activiti-extension/src/main/docker/activiti-docker-build_image.sh b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
index 4235c18..4dfa0de 100644
--- a/activiti-extension/src/main/docker/activiti-docker-build_image.sh
+++ b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
@@ -108,6 +108,8 @@ wget -O activiti-extension.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/
rm -Rf ./temp/
mkdir -p ./temp/WEB-INF/lib/
cp -f activiti-extension*.jar ./temp/WEB-INF/lib/activiti-extension.jar
+cp -f swagger.json ./temp/
+
echo "download jackson-annotations 2.5.1"
wget -O jackson-annotations-2.2.3.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=central&g=com.fasterxml.jackson.core&a=jackson-annotations&e=jar&v=2.5.1"
diff --git a/activiti-extension/src/main/docker/swagger.json b/activiti-extension/src/main/docker/swagger.json
new file mode 100644
index 0000000..ad4a6ad
--- /dev/null
+++ b/activiti-extension/src/main/docker/swagger.json
@@ -0,0 +1,161 @@
+{
+ "swagger": "2.0",
+ "info": {
+ "version": "1.0",
+ "title": "api"
+ },
+ "basePath": "/activiti-rest/service",
+ "tags": [
+ {
+ "name": "Activiti Resource"
+ }
+ ],
+ "paths": {
+ "/repository/deployments": {
+ "post": {
+ "tags": [
+ "Activiti Resource"
+ ],
+ "summary": "deploy bpmn file",
+ "description": "",
+ "operationId": "deployBpmnFile",
+ "consumes": [
+ "multipart/form-data"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "parameters": [
+ {
+ "name": "file",
+ "in": "formData",
+ "description": "file inputstream",
+ "required": true,
+ "type": "file"
+ }
+ ],
+ "responses": {
+ "201": {
+ "description": "created"
+ },
+ "400": {
+ "description": "deploy failed"
+ }
+ }
+ }
+ },
+ "/repository/deployments/{deploymentId}": {
+ "delete": {
+ "tags": [
+ "Activiti Resource"
+ ],
+ "summary": "undeploy bpmn file",
+ "description": "",
+ "operationId": "undeployBpmnFile",
+ "consumes": [
+ "text/plain"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "parameters": [
+ {
+ "name": "deploymentId",
+ "in": "path",
+ "description": "deploymentId",
+ "required": true,
+ "type": "string"
+ }
+ ],
+ "responses": {
+ "204": {
+ "description": "successful operation"
+ },
+ "404": {
+ "description": "not find service"
+ }
+ }
+ }
+ },
+ "/runtime/process-instances": {
+ "post": {
+ "tags": [
+ "Activiti Resource"
+ ],
+ "summary": "package process",
+ "description": "",
+ "operationId": "startProcess",
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "parameters": [
+ {
+ "in": "body",
+ "name": "body",
+ "description": "request",
+ "required": false,
+ "schema": {
+ "$ref": "#/definitions/StartProcessRequest"
+ }
+ }
+ ],
+ "responses": {
+ "201": {
+ "description": "successful",
+ "schema": {
+ "$ref": "#/definitions/ResponseInstance"
+ }
+ },
+ "404": {
+ "description": "error ",
+ "schema": {
+ "type": "string"
+ }
+ }
+ }
+ }
+ }
+ },
+ "definitions": {
+ "ResponseInstance": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string"
+ },
+ "url": {
+ "type": "string"
+ },
+ "businessKey": {
+ "type": "string"
+ },
+ "processDefinitionUrl": {
+ "type": "string"
+ },
+ "activityId": {
+ "type": "string"
+ }
+ }
+ },
+ "StartProcessRequest": {
+ "type": "object",
+ "properties": {
+ "processDefinitionId": {
+ "type": "string"
+ },
+ "businessKey": {
+ "type": "string"
+ },
+ "variables": {
+ "type": "object",
+ "additionalProperties": {
+ "type": "string"
+ }
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestClient.java b/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestClient.java
index 4d92dcb..e90da7c 100644
--- a/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestClient.java
+++ b/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestClient.java
@@ -243,7 +243,7 @@ public class RestClient {
httpPost.setHeader("Content-type", "application/json");
httpPost.setHeader(Constants.AUTHORIZATION, ToolUtil.getHeader());
httpPost.setEntity(requestEntity);
- returnValue = httpClient.execute(httpPost, responseHandler); // 调接口获取返回值时,必须用此方法
+// returnValue = httpClient.execute(httpPost, responseHandler); // 调接口获取返回值时,必须用此方法
CloseableHttpResponse httpResonse = httpClient.execute(httpPost);
if (httpResonse != null && httpResonse.getStatusLine() != null) {
int statusCode = httpResonse.getStatusLine().getStatusCode();