},
"apds_service": {
},
- "apds_rest": {
- },
"apds_scriptA": {
"category": "aaa"
},
"apds_serviceA": {
"category": "aaa"
},
- "apds_restA": {
- "category": "aaa"
- },
- "apds_restB": {
+ "apds_serviceB": {
"category": "aaa"
}
},
"collapse": true
}
}
-}
\ No newline at end of file
+}
"inputs": {}
}
},
- {
- "id": "apds_rest",
- "displayName": {
- "zh_CN": "REST",
- "en_US": "REST"
- },
- "description": {
- "zh_CN": "REST 节点",
- "en_US": "REST Node"
- },
- "type": "restTask",
- "icon": {
- "name": "apds_rest",
- "width": 56,
- "height": 56
- },
- "content": {
- "url": "",
- "name": "",
- "version": "",
- "path": "",
- "method": "",
- "accept": "",
- "inputs": {}
- }
- },
{
"id": "apds_script",
"displayName": {
{
"id": "apds_scriptA",
"displayName": {
- "zh_CN": "JavaScript",
- "en_US": "JavaScript"
+ "zh_CN": "Stop traffic",
+ "en_US": "Stop traffic"
},
"description": {
- "zh_CN": "脚本节点",
- "en_US": "Script Node"
+ "zh_CN": "Stop traffic",
+ "en_US": "Stop traffic"
},
"type": "scriptTask",
"icon": {
{
"id": "apds_scriptB",
"displayName": {
- "zh_CN": "Groovy Task",
- "en_US": "Groovy Task"
+ "zh_CN": "Drain traffic",
+ "en_US": "Drain traffic"
},
"description": {
- "zh_CN": "Groovy Task",
- "en_US": "Groovy Task"
+ "zh_CN": "Drain traffic",
+ "en_US": "Drain traffic"
},
"type": "scriptTask",
"icon": {
{
"id": "apds_serviceA",
"displayName": {
- "zh_CN": "Java Task",
- "en_US": "Java Task"
+ "zh_CN": "Stop VNF",
+ "en_US": "Stop VNF"
},
"description": {
- "zh_CN": "Java Task",
- "en_US": "Java Task"
+ "zh_CN": "Stop VNF",
+ "en_US": "Stop VNF"
},
"type": "serviceTask",
"icon": {
"height": 56
},
"content": {
- "class": "com.zte.ums.workflow.activitiext.restservicetask.HttpUtil",
+ "class": "org.onap.sdc.workflow.task.StopVNFDelegate",
"inputs": {
"param1": {
"type": "string",
}
},
{
- "id": "apds_restA",
- "displayName": {
- "zh_CN": "REST无参数",
- "en_US": "REST No Parameters"
- },
- "description": {
- "zh_CN": "REST无参数",
- "en_US": "REST No Parameters"
- },
- "type": "restTask",
- "icon": {
- "name": "apds_rest",
- "width": 56,
- "height": 56
- },
- "content": {
- "serviceName": "name",
- "serviceVersion": "v1",
- "baseUrl": "url",
- "path": "/test/",
- "method": "put",
- "consumes": "application/json, text/plain",
- "produces": "application/json, text/plain",
- "inputs": {}
- }
- },
- {
- "id": "apds_restB",
+ "id": "apds_serviceB",
"displayName": {
- "zh_CN": "REST复杂参数",
- "en_US": "REST Complex Parameters"
+ "zh_CN": "Create VNF",
+ "en_US": "Create VNF"
},
"description": {
- "zh_CN": "REST复杂参数",
- "en_US": "REST Complex Parameters"
+ "zh_CN": "Create VNF",
+ "en_US": "Create VNF"
},
- "type": "restTask",
+ "type": "serviceTask",
"icon": {
- "name": "apds_rest",
+ "name": "apds_service",
"width": 56,
"height": 56
},
"content": {
- "serviceName": "ServiceName",
- "serviceVersion": "v1",
- "baseUrl": "url",
- "path": "/test/",
- "method": "put",
- "consumes": "application/json, text/plain",
- "produces": "application/json, text/plain",
+ "class": "org.onap.sdc.workflow.task.CreateVNFDelegate",
"inputs": {
- "param1": {
- "in": "query",
+ "id": {
"type": "string",
"default": "default",
"required": false,
- "show": false,
+ "displayName": {
+ "zh_CN": "id",
+ "en_US": "id"
+ },
+ "show": true,
"editable": true
},
- "param2": {
- "in": "body",
- "schema": {
- "type": "object",
- "properties": {
- "a": {
- "type": "number",
- "default": 123
- },
- "b": {
- "type": "string",
- "default": "xyz"
- },
- "c": {
- "type": "array",
- "items": {
- "type": "string",
- "enum": [
- "a",
- "b",
- "c"
- ]
- }
- },
- "d": {
- "type": "array",
- "items": {
- "type": "object",
- "properties": {
- "p1": {
- "type": "number"
- },
- "p2": {
- "type": "boolean"
- }
- }
- }
- },
- "y": {
- "type": "object",
- "additionalProperties": {
- "type": "string"
- }
- },
- "z": {
- "type": "object",
- "additionalProperties": {
- "type": "integer"
- }
- }
- }
- },
+ "name": {
+ "type": "string",
"required": true,
+ "displayName": {
+ "zh_CN": "name",
+ "en_US": "name"
+ },
"show": true,
"editable": true
},
- "param3": {
- "in": "path",
+ "type": {
"type": "string",
"default": "value3",
"required": true,
+ "displayName": {
+ "zh_CN": "type",
+ "en_US": "type"
+ },
"show": true,
"editable": false
}
},
"outputs": {
- "body": {
+ "status": {
+ "type": "string",
+ "required": false,
"displayName": {
- "zh_CN": "消息体",
- "en_US": "Message Body"
- },
- "schema": {
- "type": "object",
- "properties": {
- "a": {
- "type": "number"
- },
- "b": {
- "type": "string"
- },
- "c": {
- "type": "array",
- "items": {
- "type": "string",
- "enum": [
- "a",
- "b",
- "c"
- ]
- }
- },
- "d": {
- "type": "array",
- "items": {
- "type": "object",
- "properties": {
- "p1": {
- "type": "number"
- },
- "p2": {
- "type": "boolean"
- }
- }
- }
- },
- "y": {
- "type": "object",
- "additionalProperties": {
- "type": "string"
- }
- },
- "z": {
- "type": "object",
- "additionalProperties": {
- "type": "integer"
- }
- }
- }
+ "zh_CN": "status",
+ "en_US": "status of vnf"
},
- "editable": false
+ "show": true,
+ "editable": true
}
}
}
}
-]
\ No newline at end of file
+]
"data": {\r
"nodes": [\r
{\r
- "id": "node0",\r
+ "id": "startEvent",\r
"type": "startEvent",\r
"name": "Start",\r
"parentId": "root",\r
"position": {\r
- "left": 99,\r
- "top": 131,\r
+ "left": 73,\r
+ "top": 160,\r
"width": 56,\r
"height": 56\r
},\r
"connection": [\r
{\r
- "sourceRef": "node0",\r
- "targetRef": "serviceTask"\r
+ "sourceRef": "startEvent",\r
+ "targetRef": "scriptTask"\r
}\r
],\r
- "parameters": [\r
- {\r
- "name": "aaa",\r
- "value": "a111",\r
- "valueSource": "string",\r
- "type": "string",\r
- "required": false,\r
- "show": true,\r
- "errorMsg": ""\r
- },\r
+ "parameters": []\r
+ },\r
+ {\r
+ "id": "scriptTask",\r
+ "type": "scriptTask",\r
+ "typeId": "apds_scriptA",\r
+ "icon": "apds_script",\r
+ "name": "Stop traffic",\r
+ "parentId": "root",\r
+ "position": {\r
+ "left": 175,\r
+ "top": 160,\r
+ "width": 56,\r
+ "height": 56\r
+ },\r
+ "connection": [\r
{\r
- "name": "bbb",\r
- "value": "b111",\r
- "valueSource": "string",\r
- "type": "string",\r
- "required": false,\r
- "show": true,\r
- "errorMsg": ""\r
+ "sourceRef": "scriptTask",\r
+ "targetRef": "scriptTask_2"\r
}\r
- ]\r
+ ],\r
+ "scriptFormat": "JavaScript",\r
+ "script": "abc"\r
},\r
{\r
- "id": "node2",\r
- "type": "endEvent",\r
- "name": "End",\r
+ "id": "scriptTask_2",\r
+ "type": "scriptTask",\r
+ "typeId": "apds_scriptB",\r
+ "icon": "apds_script",\r
+ "name": "Drain traffic",\r
"parentId": "root",\r
"position": {\r
- "left": 459,\r
- "top": 131,\r
+ "left": 289,\r
+ "top": 160,\r
"width": 56,\r
"height": 56\r
},\r
- "connection": []\r
+ "connection": [\r
+ {\r
+ "sourceRef": "scriptTask_2",\r
+ "targetRef": "serviceTask"\r
+ }\r
+ ],\r
+ "scriptFormat": "Groovy",\r
+ "script": "xyz"\r
},\r
{\r
"id": "serviceTask",\r
"type": "serviceTask",\r
"typeId": "apds_serviceA",\r
"icon": "apds_service",\r
- "name": "Java Task",\r
+ "name": "Stop VNF",\r
"parentId": "root",\r
"position": {\r
- "left": 232,\r
- "top": 131,\r
+ "left": 392,\r
+ "top": 160,\r
"width": 56,\r
"height": 56\r
},\r
"connection": [\r
{\r
"sourceRef": "serviceTask",\r
- "targetRef": "scriptTask"\r
+ "targetRef": "serviceTask_2"\r
}\r
],\r
- "className": "org.onap.sdc.workflowdesigner.JavaTask",\r
+ "className": "",\r
"inputs": [\r
{\r
"name": "param1",\r
+ "value": "default",\r
"valueSource": "string",\r
"type": "string",\r
"required": false,\r
"show": true,\r
- "errorMsg": "",\r
- "value": "a111"\r
+ "errorMsg": ""\r
},\r
{\r
"name": "param2",\r
+ "value": null,\r
"valueSource": "string",\r
"type": "string",\r
"required": true,\r
"show": true,\r
- "errorMsg": "",\r
- "value": "b111"\r
+ "errorMsg": ""\r
},\r
{\r
"name": "param3",\r
+ "value": "value3",\r
"valueSource": "string",\r
"type": "string",\r
"required": true,\r
"show": true,\r
- "errorMsg": "",\r
- "value": "c111"\r
+ "errorMsg": ""\r
}\r
],\r
"outputs": [\r
{\r
"name": "out1",\r
- "value": "",\r
+ "value": null,\r
"valueSource": "string",\r
"type": "string",\r
"required": false,\r
]\r
},\r
{\r
- "id": "scriptTask",\r
- "type": "scriptTask",\r
- "typeId": "apds_scriptB",\r
- "icon": "apds_script",\r
- "name": "Groovy Task",\r
+ "id": "serviceTask_2",\r
+ "type": "serviceTask",\r
+ "typeId": "apds_serviceB",\r
+ "icon": "apds_service",\r
+ "name": "Create VNF",\r
"parentId": "root",\r
"position": {\r
- "left": 335,\r
- "top": 131,\r
+ "left": 500,\r
+ "top": 160,\r
"width": 56,\r
"height": 56\r
},\r
"connection": [\r
{\r
- "sourceRef": "scriptTask",\r
- "targetRef": "node2"\r
+ "sourceRef": "serviceTask_2",\r
+ "targetRef": "serviceTask_3"\r
+ }\r
+ ]\r
+ },\r
+ {\r
+ "id": "serviceTask_3",\r
+ "type": "serviceTask",\r
+ "typeId": "apds_service",\r
+ "icon": "apds_service",\r
+ "name": "Start VNF",\r
+ "parentId": "root",\r
+ "position": {\r
+ "left": 620,\r
+ "top": 160,\r
+ "width": 56,\r
+ "height": 56\r
+ },\r
+ "connection": [\r
+ {\r
+ "sourceRef": "serviceTask_3",\r
+ "targetRef": "endEvent"\r
}\r
],\r
- "scriptFormat": "Groovy",\r
- "script": "xyz"\r
+ "className": "",\r
+ "inputs": [],\r
+ "outputs": []\r
+ },\r
+ {\r
+ "id": "endEvent",\r
+ "type": "endEvent",\r
+ "name": "End",\r
+ "parentId": "root",\r
+ "position": {\r
+ "left": 744,\r
+ "top": 160,\r
+ "width": 56,\r
+ "height": 56\r
+ },\r
+ "connection": []\r
}\r
]\r
}\r
-}
\ No newline at end of file
+}\r
<properties>
<velocity.version>1.7</velocity.version>
+ <commons-collections.version>3.2.2</commons-collections.version>
<commons-io.version>2.4</commons-io.version>
<dom4j.version>1.6.1</dom4j.version>
<dropwizard.version>1.2.2</dropwizard.version>
<groupId>io.swagger</groupId>
<artifactId>swagger-jersey2-jaxrs</artifactId>
<version>${swagger.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- jersey -->
<groupId>com.eclipsesource.jaxrs</groupId>
<artifactId>consumer</artifactId>
<version>${jaxrs.consumer.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.eclipsesource.jaxrs</groupId>
+ <artifactId>jersey-all</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
</dependency>
<dependency>
package org.onap.sdc.workflowdesigner;
-//import org.glassfish.jersey.media.multipart.MultiPartFeature;
import org.onap.sdc.workflowdesigner.config.AdapterType;
import org.onap.sdc.workflowdesigner.config.AppConfig;
import org.onap.sdc.workflowdesigner.resources.ExtendActivityResource;
// register rest interface
environment.jersey().packages("org.onap.sdc.workflowdesigner.resources");
-// // upload file by inputstream need to register MultiPartFeature
-// environment.jersey().register(MultiPartFeature.class);
initSwaggerConfig(environment, configuration);
*/
package org.onap.sdc.workflowdesigner.common;
-public class WorkflowDesignerException extends Exception {
+public class SDCProxyException extends Exception {
private static final long serialVersionUID = 1L;
- public WorkflowDesignerException() {
+ public SDCProxyException() {
super();
}
- public WorkflowDesignerException(String msg, Exception e) {
+ public SDCProxyException(String msg, Exception e) {
super(msg, e);
}
- public WorkflowDesignerException(String msg) {
+ public SDCProxyException(String msg) {
super(msg);
}
}
package org.onap.sdc.workflowdesigner.externalservice.sdc;
import org.glassfish.jersey.client.ClientConfig;
-import org.onap.sdc.workflowdesigner.common.WorkflowDesignerException;
+import org.onap.sdc.workflowdesigner.common.SDCProxyException;
import org.onap.sdc.workflowdesigner.config.AppConfig;
import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.ActivitySpec;
import org.slf4j.Logger;
private static final String X_ECOMP_INSTANCE_ID =
AppConfig.getSdcServiceProxy().getxEcompInstanceId();
/** */
- private static final String Activity_ROOT_PATH = "/activityspec-api/v1.0";
+ private static final String ACTIVITY_ROOT_PATH = "/activityspec-api/v1.0";
private static String getActivityRootPath() {
- return AppConfig.getSdcServiceProxy().getServiceAddr() + Activity_ROOT_PATH;
+ return AppConfig.getSdcServiceProxy().getServiceAddr() + ACTIVITY_ROOT_PATH;
}
/**
/**
*
* @return
- * @throws WorkflowDesignerException
+ * @throws SDCProxyException
*/
- public ActivitySpec[] getActivitySpecs() throws WorkflowDesignerException {
+ public ActivitySpec[] getActivitySpecs() throws SDCProxyException {
ActivitySpecService serviceProxy = getActivityServiceProxy();
try {
return serviceProxy.getActivitySpecs(X_ECOMP_INSTANCE_ID, AUTHORIZATION);
} catch (Exception e) {
LOGGER.error("Get Activity Specifications Failed.", e);
- throw new WorkflowDesignerException("Get Activity Specifications Failed.", e);
+ throw new SDCProxyException("Get Activity Specifications Failed.", e);
}
}
package org.onap.sdc.workflowdesigner.externalservice.sdc;
import org.glassfish.jersey.client.ClientConfig;
-import org.onap.sdc.workflowdesigner.common.WorkflowDesignerException;
+import org.onap.sdc.workflowdesigner.common.SDCProxyException;
import org.onap.sdc.workflowdesigner.config.AppConfig;
import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.WorkflowArtifactInfo;
import org.slf4j.Logger;
* @param operationId
* @param workflowId
* @param workflowArtifactInfo
- * @throws WorkflowDesignerException
+ * @throws SDCProxyException
*/
public void saveWorkflowArtifact(String uuid, String operationId, String workflowId,
- WorkflowArtifactInfo workflowArtifactInfo) throws WorkflowDesignerException {
+ WorkflowArtifactInfo workflowArtifactInfo) throws SDCProxyException {
SDCService serviceProxy = getSDCServiceProxy();
try {
serviceProxy.saveWorkflowArtifact(uuid, operationId, workflowId, X_ECOMP_INSTANCE_ID,
AUTHORIZATION, workflowArtifactInfo);
} catch (Exception e) {
LOGGER.error("Save WorkflowArtifact Failed.", e);
- throw new WorkflowDesignerException("Save WorkflowArtifact Failed.", e);
+ throw new SDCProxyException("Save WorkflowArtifact Failed.", e);
}
}
* @param operationId
* @param workflowId
* @return
- * @throws WorkflowDesignerException
+ * @throws SDCProxyException
*/
public WorkflowArtifactInfo getWorkflowArtifact(String uuid, String operationId,
- String workflowId) throws WorkflowDesignerException {
+ String workflowId) throws SDCProxyException {
SDCService serviceProxy = getSDCServiceProxy();
try {
return serviceProxy.getWorkflowArtifact(uuid, operationId, workflowId, X_ECOMP_INSTANCE_ID,
AUTHORIZATION);
} catch (Exception e) {
LOGGER.error("Get WorkflowArtifact Failed.", e);
- throw new WorkflowDesignerException("Get WorkflowArtifact Failed.", e);
+ throw new SDCProxyException("Get WorkflowArtifact Failed.", e);
}
}
*/\r
package org.onap.sdc.workflowdesigner.externalservice.sdc.entity;\r
\r
+import com.fasterxml.jackson.annotation.JsonProperty;\r
import com.google.gson.annotations.SerializedName;\r
\r
/**\r
*\r
*/\r
public class ActivityContent {\r
- @SerializedName("class")\r
- private String clazz;\r
+ @JsonProperty(value="class") // for dropwizard's Jackson\r
+ @SerializedName("class") // for Gson\r
+ public String clazz;\r
\r
private String scriptFormat;\r
\r
private String script;\r
\r
- /**\r
- * @return the clazz\r
- */\r
- public String getClazz() {\r
- return clazz;\r
- }\r
-\r
- /**\r
- * @param clazz the clazz to set\r
- */\r
- public void setClazz(String clazz) {\r
- this.clazz = clazz;\r
- }\r
\r
/**\r
* @return the scriptFormat\r
\r
private String type;\r
\r
- private ActivityContent content;\r
+ private ActivityContent content = new ActivityContent();\r
\r
private String[] categoryList;\r
\r
package org.onap.sdc.workflowdesigner.resources;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.core.Response;
import org.eclipse.jetty.http.HttpStatus;
+import org.onap.sdc.workflowdesigner.common.SDCProxyException;
+import org.onap.sdc.workflowdesigner.config.AppConfig;
+import org.onap.sdc.workflowdesigner.externalservice.sdc.ActivitySpecServiceProxy;
+import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.ActivitySpec;
+import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.Parameter;
import org.onap.sdc.workflowdesigner.resources.entity.ExtActivityDisplayInfo;
-import org.onap.sdc.workflowdesigner.resources.entity.ExtendActivity;
+import org.onap.sdc.workflowdesigner.resources.entity.I18nString;
+import org.onap.sdc.workflowdesigner.resources.entity.InputOutput;
+import org.onap.sdc.workflowdesigner.resources.entity.NodeCategory;
+import org.onap.sdc.workflowdesigner.resources.entity.CategoryData;
+import org.onap.sdc.workflowdesigner.resources.entity.Content;
+import org.onap.sdc.workflowdesigner.resources.entity.ExtActivity;
import org.onap.sdc.workflowdesigner.utils.FileCommonUtils;
import org.onap.sdc.workflowdesigner.utils.JsonUtils;
import org.onap.sdc.workflowdesigner.utils.RestUtils;
private static final String EXT_ACTIVITIES_FILE_NAME = "ext-activities.json";
+ private static final CategoryData EXTENSION_TASK_CATEGORY =
+ new CategoryData(new I18nString("Extension Task", "Extension Task"));
+
+ private static final String EXTENSION_TASK_CATEGORY_CATEGORY_ID = "extension_task_category_id";
+
/**
* test function.
*
@GET
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Get Extend Activities.", response = ExtendActivity.class,
+ @ApiOperation(value = "Get Extend Activities.", response = ExtActivity.class,
responseContainer = "List")
@ApiResponses(value = {
@ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
response = String.class)})
@Timed
public Response getExtActivities(@ApiParam(value = "sence") @QueryParam("sence") String sence) {
+ if (AppConfig.isSDCAdapter()) {
+ return getExtActivitiesfromSDC();
+ } else {
+ return getExtActivitiesfromLocal();
+ }
+ }
+ /**
+ * @return
+ */
+ private Response getExtActivitiesfromLocal() {
try {
- ExtendActivity[] extActivities = retriveExtActivites(sence);
+ String json = FileCommonUtils.readString(EXT_ACTIVITIES_FILE_NAME);
+ ExtActivity[] extActivities = JsonUtils.fromJson(json, ExtActivity[].class);
return Response.status(Response.Status.OK).entity(extActivities).build();
} catch (IOException e) {
- LOGGER.error("Get ExtActivities failed.", e);
+ LOGGER.error("Get ExtActivities from local failed.", e);
throw RestUtils.newInternalServerErrorException(e);
}
+ }
+ /**
+ * @return
+ */
+ private Response getExtActivitiesfromSDC() {
+ try {
+ ActivitySpecServiceProxy proxy = new ActivitySpecServiceProxy();
+ ActivitySpec[] activitySpecs = proxy.getActivitySpecs();
+ ExtActivity[] extActivities = convert2ExtActivities(activitySpecs);
+ return Response.status(Response.Status.OK).entity(extActivities).build();
+ } catch (SDCProxyException e) {
+ LOGGER.error("Get ExtActivities from sdc failed.", e);
+ throw RestUtils.newInternalServerErrorException(e);
+ }
}
/**
- * @param sence
+ * @param activitySpecs
+ * @return
+ */
+ private ExtActivity[] convert2ExtActivities(ActivitySpec[] activitySpecs) {
+ ExtActivity[] extendActivities = new ExtActivity[activitySpecs.length];
+ for (int i = 0; i < activitySpecs.length; i++) {
+ extendActivities[i] = convert2ExtActivity(activitySpecs[i]);
+ }
+ return extendActivities;
+ }
+
+ /**
+ * @param activitySpec
+ * @return
+ */
+ private ExtActivity convert2ExtActivity(ActivitySpec activitySpec) {
+ ExtActivity extActivity = new ExtActivity();
+ extActivity.setId(activitySpec.getId());
+ extActivity.setDisplayName(new I18nString(activitySpec.getName(), activitySpec.getName()));
+ extActivity.setDescription(
+ new I18nString(activitySpec.getDescription(), activitySpec.getDescription()));
+ extActivity.setType(activitySpec.getType());
+ extActivity.setContent(buildContent(activitySpec));
+ return extActivity;
+ }
+
+ /**
+ * @param activitySpec
+ * @return
+ */
+ private Content buildContent(ActivitySpec activitySpec) {
+ Content content = new Content();
+// content.setClass(activitySpec.getContent().getClazz());
+ content.clazz = activitySpec.getContent().clazz;
+ content.setScript(activitySpec.getContent().getScript());
+ content.setScriptFormat(activitySpec.getContent().getScriptFormat());
+ content.setInputs(convert2InputOutputs(activitySpec.getInputs()));
+ content.setOutputs(convert2InputOutputs(activitySpec.getOutputs()));
+ return content;
+ }
+
+ /**
+ * @param parameters
+ * @return
+ */
+ private Map<String, InputOutput> convert2InputOutputs(Parameter[] parameters) {
+ Map<String, InputOutput> inputOutputs = new HashMap<>();
+ for (Parameter parameter : parameters) {
+ inputOutputs.put(parameter.getName(), convert2InputOutput(parameter));
+ }
+ return inputOutputs;
+ }
+
+ /**
+ * @param parameter
* @return
- * @throws IOException
*/
- protected ExtendActivity[] retriveExtActivites(String sence) throws IOException {
- String json = FileCommonUtils.readString(EXT_ACTIVITIES_FILE_NAME);
- return JsonUtils.fromJson(json, ExtendActivity[].class);
+ private InputOutput convert2InputOutput(Parameter parameter) {
+ InputOutput inputOutput = new InputOutput();
+ inputOutput.setDisplayName(new I18nString(parameter.getName(), parameter.getName()));
+ inputOutput.setType(parameter.getType());
+ inputOutput.setDefault(parameter.getDefault());
+ inputOutput.setValue(parameter.getValue());
+ return inputOutput;
}
response = String.class)})
@Timed
public Response getDisplayInfo(@ApiParam(value = "sence") @QueryParam("sence") String sence) {
+ if (AppConfig.isSDCAdapter()) {
+ return getDisplayInfofromSDC();
+ } else {
+ return getDisplayInfofromLocal(sence);
+ }
+ }
+
+ /**
+ * @param sence
+ * @return
+ */
+ private Response getDisplayInfofromLocal(String sence) {
try {
ExtActivityDisplayInfo displayInfo = retriveDisplayInfo(sence);
return Response.status(Response.Status.OK).entity(displayInfo).build();
} catch (IOException e) {
- LOGGER.error("Get Extend Activities DisplayInfo failed.", e);
+ LOGGER.error("Get Extend Activities DisplayInfo from failed.", e);
throw RestUtils.newInternalServerErrorException(e);
}
}
+ /**
+ * @return
+ */
+ private Response getDisplayInfofromSDC() {
+ try {
+ ActivitySpecServiceProxy proxy = new ActivitySpecServiceProxy();
+ ActivitySpec[] activitySpecs = proxy.getActivitySpecs();
+ ExtActivityDisplayInfo displayInfo = convert2ExtActivityDisplayInfo(activitySpecs);
+ return Response.status(Response.Status.OK).entity(displayInfo).build();
+ } catch (SDCProxyException e) {
+ LOGGER.error("Get Extend Activities DisplayInfo from sdc failed.", e);
+ throw RestUtils.newInternalServerErrorException(e);
+ }
+ }
+
+ /**
+ * @param activitySpecs
+ * @return
+ */
+ private ExtActivityDisplayInfo convert2ExtActivityDisplayInfo(ActivitySpec[] activitySpecs) {
+ ExtActivityDisplayInfo displayInfo = new ExtActivityDisplayInfo();
+
+ for (ActivitySpec activitySpec : activitySpecs) {
+ displayInfo.getNodes().put(activitySpec.getId(), buildNodeCategory(activitySpec));
+ }
+
+ displayInfo.getCategoryData().put(EXTENSION_TASK_CATEGORY_CATEGORY_ID, EXTENSION_TASK_CATEGORY);
+
+ return displayInfo;
+ }
+
+ /**
+ * @param activitySpec
+ * @return
+ */
+ private NodeCategory buildNodeCategory(ActivitySpec activitySpec) {
+ NodeCategory nodeCategory = new NodeCategory();
+ nodeCategory.setCategory(EXTENSION_TASK_CATEGORY_CATEGORY_ID);
+
+ return nodeCategory;
+ }
+
/**
* @param sence
* @return
import java.io.IOException;
import java.net.URI;
-//import java.nio.file.Paths;
+import java.nio.file.Paths;
import java.util.List;
-//import java.util.UUID;
+import java.util.UUID;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.eclipse.jetty.http.HttpStatus;
-//import org.onap.sdc.workflowdesigner.common.WorkflowDesignerException;
-//import org.onap.sdc.workflowdesigner.externalservice.sdc.SDCServiceProxy;
-//import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.WorkflowArtifactInfo;
+import org.onap.sdc.workflowdesigner.common.SDCProxyException;
+import org.onap.sdc.workflowdesigner.config.AppConfig;
+import org.onap.sdc.workflowdesigner.externalservice.sdc.SDCServiceProxy;
+import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.WorkflowArtifactInfo;
import org.onap.sdc.workflowdesigner.model.Process;
import org.onap.sdc.workflowdesigner.parser.Bpmn4ToscaJsonParser;
-//import org.onap.sdc.workflowdesigner.resources.entity.WorkflowInfo;
+import org.onap.sdc.workflowdesigner.resources.entity.WorkflowInfo;
import org.onap.sdc.workflowdesigner.utils.FileCommonUtils;
-//import org.onap.sdc.workflowdesigner.utils.JsonUtils;
+import org.onap.sdc.workflowdesigner.utils.JsonUtils;
import org.onap.sdc.workflowdesigner.utils.RestUtils;
+import org.onap.sdc.workflowdesigner.utils.ToolUtils;
import org.onap.sdc.workflowdesigner.writer.BpmnPlanArtefactWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private static final Logger logger = LoggerFactory.getLogger(WorkflowModelerResource.class);
private static final String WORKFLOW_JSON_TEMP_FILE_NAME = "temp_workflow.json";
-// private static final String WORKFLOW_XML_TEMP_FILE_NAME = "temp_workflow.xml";
+ private static final String WORKFLOW_XML_TEMP_FILE_NAME = "temp_workflow.xml";
/**
@GET
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Get Model", response = String.class)
+ @ApiOperation(value = "Get Model", response = WorkflowInfo.class)
@ApiResponses(value = {
@ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
response = String.class),
@ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "server internal error",
response = String.class)})
@Timed
- public Response getModel(@ApiParam(value = "id") @PathParam("id") String id) {
+ public Response getModel(@ApiParam(value = "id") @PathParam("id") String id,
+ @ApiParam(value = "name") @QueryParam("name") String name,
+ @ApiParam(value = "uuid") @QueryParam("uuid") String uuid,
+ @ApiParam(value = "operationId") @QueryParam("operationId") String operationId) {
+ if (AppConfig.isSDCAdapter()) {
+ return getModelfromSDC(uuid, operationId, id, name);
+ } else {
+ return getModelfromLocal();
+ }
+
+ }
+
+ /**
+ * @return
+ */
+ private Response getModelfromLocal() {
try {
String json = FileCommonUtils.readString(WORKFLOW_JSON_TEMP_FILE_NAME);
return Response.status(Response.Status.OK).entity(json).build();
} catch (IOException e) {
- logger.error("get workflow failed.", e);
+ logger.error("get workflow from local failed.", e);
throw RestUtils.newInternalServerErrorException(e);
}
}
+ /**
+ * @param uuid
+ * @param operationId
+ * @param id
+ * @param name
+ * @return
+ */
+ private Response getModelfromSDC(String uuid, String operationId, String id, String name) {
+ try {
+ SDCServiceProxy sdcProxy = new SDCServiceProxy();
+ WorkflowArtifactInfo wai = sdcProxy.getWorkflowArtifact(uuid, operationId, id);
+ String bpmn = wai.getPayloadData();
+ String json = readJsonfromBPMN(bpmn);
+ if (ToolUtils.isEmpty(json)) {
+ WorkflowInfo wfi = newEmptyWorkflowInfo(uuid, operationId, id, name);
+ return Response.status(Response.Status.OK).entity(wfi).build();
+ }
+ return Response.status(Response.Status.OK).entity(json).build();
+ } catch (SDCProxyException e) {
+ logger.error("get workflow from sdc failed.", e);
+ throw RestUtils.newInternalServerErrorException(e);
+ } catch (DocumentException e) {
+ logger.error("get workflow from sdc failed.", e);
+ throw RestUtils.newInternalServerErrorException(e);
+ }
+ }
+
+ /**
+ * @param id
+ * @param operationId
+ * @param uuid
+ * @param name
+ * @return
+ */
+ private WorkflowInfo newEmptyWorkflowInfo(String uuid, String operationId, String id,
+ String name) {
+ WorkflowInfo wfi = new WorkflowInfo();
+ wfi.setId(id);
+ wfi.setName(name);
+ wfi.setUuid(uuid);
+ wfi.setOperationId(operationId);
+
+ return wfi;
+ }
+
+
@Path("/{id}")
@PUT
@ApiParam(value = "Model Content", required = true) String json) {
try {
FileCommonUtils.write(WORKFLOW_JSON_TEMP_FILE_NAME, json);
-
- // TODO for Nexus-IQ
-// URI srcUri = Paths.get(".", WORKFLOW_JSON_TEMP_FILE_NAME).toUri();
-// String processName = "plan_" + UUID.randomUUID().toString();
-// String bpmn = buildBPMN(srcUri, processName);
-// String jsonBpmn = insertJson2Bpmn(json, bpmn);
-// save2SDC(json, jsonBpmn);
-// FileCommonUtils.write(WORKFLOW_XML_TEMP_FILE_NAME, jsonBpmn);
+ URI srcUri = Paths.get(".", WORKFLOW_JSON_TEMP_FILE_NAME).toUri();
+ String processName = "plan_" + UUID.randomUUID().toString();
+ String bpmn = buildBPMN(srcUri, processName);
+ String jsonBpmn = insertJson2Bpmn(json, bpmn);
+
+ if (AppConfig.isSDCAdapter()) {
+ save2SDC(json, jsonBpmn);
+ }
+ FileCommonUtils.write(WORKFLOW_XML_TEMP_FILE_NAME, jsonBpmn);
return Response.status(Response.Status.OK).entity(json).build();
} catch (IOException e) {
* @return
* @throws DocumentException
*/
- protected String readJsonfromBPMNFile(String bpmn) throws DocumentException {
+ protected String readJsonfromBPMN(String bpmn) throws DocumentException {
+ if (ToolUtils.isEmpty(bpmn)) {
+ return null;
+ }
+
Document doc = DocumentHelper.parseText(bpmn);
List<?> elementList = doc.content();
for (Object object : elementList) {
}
-// /**
-// * @param json
-// * @param bpmn
-// * @throws WorkflowDesignerException
-// */
-// private void save2SDC(String json, String bpmn) throws WorkflowDesignerException {
-// WorkflowInfo workflowInfo = JsonUtils.fromJson(json, WorkflowInfo.class);
-// WorkflowArtifactInfo workflowArtifactInfo =
-// new WorkflowArtifactInfo(workflowInfo.getName(), workflowInfo.getDescription(), bpmn);
-//
-// SDCServiceProxy sdcProxy = new SDCServiceProxy();
-// sdcProxy.saveWorkflowArtifact(workflowInfo.getUuid(), workflowInfo.getOperationId(),
-// workflowInfo.getId(), workflowArtifactInfo);
-// }
+ /**
+ * @param json
+ * @param bpmn
+ * @throws SDCProxyException
+ */
+ private void save2SDC(String json, String bpmn) throws SDCProxyException {
+ WorkflowInfo workflowInfo = JsonUtils.fromJson(json, WorkflowInfo.class);
+ WorkflowArtifactInfo workflowArtifactInfo =
+ new WorkflowArtifactInfo(workflowInfo.getName(), workflowInfo.getDescription(), bpmn);
+
+ SDCServiceProxy sdcProxy = new SDCServiceProxy();
+ sdcProxy.saveWorkflowArtifact(workflowInfo.getUuid(), workflowInfo.getOperationId(),
+ workflowInfo.getId(), workflowArtifactInfo);
+ }
/**
*
\r
import java.util.Map;\r
\r
+import com.fasterxml.jackson.annotation.JsonInclude;\r
+import com.fasterxml.jackson.annotation.JsonInclude.Include;\r
+import com.fasterxml.jackson.annotation.JsonProperty;\r
import com.google.gson.annotations.SerializedName;\r
\r
/**\r
*\r
*/\r
+@JsonInclude(Include.NON_NULL)\r
public class Content {\r
- @SerializedName("class")\r
- private String clazz;\r
+ @JsonProperty(value="class") // for dropwizard's Jackson\r
+ @SerializedName("class") // for Gson\r
+ public String clazz;\r
\r
private String script;\r
\r
private Map<String, InputOutput> inputs;\r
\r
private Map<String, InputOutput> outputs;\r
-\r
- /**\r
- * @return the clazz\r
- */\r
- public String getClazz() {\r
- return clazz;\r
- }\r
-\r
- /**\r
- * @param clazz the clazz to set\r
- */\r
- public void setClass(String clazz) {\r
- this.clazz = clazz;\r
- }\r
+ \r
\r
/**\r
* @return the script\r
*/\r
package org.onap.sdc.workflowdesigner.resources.entity;\r
\r
+import com.fasterxml.jackson.annotation.JsonInclude;\r
+import com.fasterxml.jackson.annotation.JsonInclude.Include;\r
+\r
/**\r
*\r
*/\r
-public class ExtendActivity {\r
+@JsonInclude(Include.NON_NULL)\r
+public class ExtActivity {\r
private String id;\r
\r
private I18nString displayName;\r
*/\r
@Test\r
public void testToString() {\r
- String clazz = "clazz";\r
+// String clazz = "clazz";\r
String script = "script";\r
String scriptFormat = "scriptFormat";\r
\r
ActivityContent ac = new ActivityContent();\r
- ac.setClazz(clazz);\r
+// ac.setClass(clazz);\r
ac.setScript(script);\r
ac.setScriptFormat(scriptFormat );\r
\r
- assertEquals(clazz, ac.getClazz());\r
+// assertEquals(clazz, ac.getClazz());\r
assertEquals(script, ac.getScript());\r
assertEquals(scriptFormat, ac.getScriptFormat());\r
}\r
import org.junit.After;\r
import org.junit.Before;\r
import org.junit.Test;\r
-import org.onap.sdc.workflowdesigner.resources.entity.ExtendActivity;\r
+import org.onap.sdc.workflowdesigner.resources.entity.ExtActivity;\r
import org.onap.sdc.workflowdesigner.utils.FileCommonUtils;\r
import org.onap.sdc.workflowdesigner.utils.JsonUtils;\r
\r
public void tearDown() throws Exception {}\r
\r
/**\r
- * Test method for {@link org.onap.sdc.workflowdesigner.resources.ExtendActivityResource#retriveExtActivites(java.lang.String)}.\r
+ * \r
*/\r
@Test\r
public void testRetriveExtActivites() {\r
try {\r
String json = FileCommonUtils.readString(EXT_ACTIVITIES_FILE_NAME);\r
- ExtendActivity[] extActivities = JsonUtils.fromJson(json, ExtendActivity[].class);\r
+ ExtActivity[] extActivities = JsonUtils.fromJson(json, ExtActivity[].class);\r
\r
FileCommonUtils.write("test.json", JsonUtils.toJson(extActivities));\r
assertEquals(extActivities.length == 0, false);\r
public void tearDown() throws Exception {}\r
\r
/**\r
- * Test method for {@link org.onap.sdc.workflowdesigner.resources.WorkflowModelerResource#buildBPMN(java.net.URI, java.lang.String)}.\r
+ * Test method for\r
+ * {@link org.onap.sdc.workflowdesigner.resources.WorkflowModelerResource#buildBPMN(java.net.URI, java.lang.String)}.\r
*/\r
@Test\r
public void testBuildBPMN() {\r
} catch (IOException e) {\r
} catch (Exception e) {\r
}\r
-// return null;\r
- // TODO for Nexus-IQ\r
- return " ";\r
+\r
+ return null;\r
}\r
- \r
+\r
/**\r
- * Test method for {@link org.onap.sdc.workflowdesigner.resources.WorkflowModelerResource#insertJson2Bpmn(java.lang.String, java.lang.String)}.\r
+ * Test method for\r
+ * {@link org.onap.sdc.workflowdesigner.resources.WorkflowModelerResource#insertJson2Bpmn(java.lang.String, java.lang.String)}.\r
*/\r
@Test\r
public void testInsertJson2Bpmn() {\r
String bpmn = parseBpmnfromJsonFile();\r
- \r
+\r
try {\r
String json = FileCommonUtils.readString("src/main/assembly/" + WORKFLOW_JSON_TEMP_FILE_NAME);\r
WorkflowModelerResource resource = new WorkflowModelerResource();\r
String combineBpmn = resource.insertJson2Bpmn(json, bpmn);\r
\r
- String json1 = resource.readJsonfromBPMNFile(combineBpmn);\r
- \r
+ String json1 = resource.readJsonfromBPMN(combineBpmn);\r
+\r
assertEqualsJson(json, json1);\r
} catch (IOException e) {\r
} catch (DocumentException e) {\r
private void assertEqualsJson(String json, String json1) {\r
WorkflowInfo wi = JsonUtils.fromJson(json, WorkflowInfo.class);\r
WorkflowInfo wi1 = JsonUtils.fromJson(json1, WorkflowInfo.class);\r
- \r
+\r
String newJson = JsonUtils.toJson(wi);\r
String newJson1 = JsonUtils.toJson(wi1);\r
\r
assertEquals(newJson1, newJson);\r
- \r
+\r
}\r
\r
}\r
import org.junit.After;\r
import org.junit.Before;\r
import org.junit.Test;\r
+import org.onap.sdc.workflowdesigner.utils.JsonUtils;\r
\r
/**\r
*\r
\r
@Test\r
public void test() {\r
- String clazz = "clazz";\r
+// String clazz = "clazz";\r
String script = "script";\r
String scriptFormat = "scriptFormat";\r
Map<String, InputOutput> inputs = new HashMap<String, InputOutput>();\r
Map<String, InputOutput> outputs = new HashMap<String, InputOutput>();\r
\r
Content c = new Content();\r
- c.setClass(clazz);\r
+// c.setClass(clazz);\r
c.setInputs(inputs);\r
c.setOutputs(outputs);\r
c.setScript(script);\r
c.setScriptFormat(scriptFormat);\r
\r
- assertEquals(clazz, c.getClazz());\r
+// assertEquals(clazz, c.getClazz());\r
assertEquals(inputs, c.getInputs());\r
assertEquals(outputs, c.getOutputs());\r
assertEquals(script, c.getScript());\r
assertEquals(scriptFormat, c.getScriptFormat());\r
}\r
+ \r
+ @Test\r
+ public void testGson() {\r
+ String json = "{\r\n" + \r
+ " \"class\": \"aaaa\",\r\n" + \r
+ " \"inputs\": {}\r\n" + \r
+ " }";\r
+ Content content = JsonUtils.fromJson(json, Content.class);\r
+ assertNotNull(content);\r
+ }\r
\r
}\r
IconData icon = new IconData();\r
Content content = new Content();\r
\r
- ExtendActivity ea = new ExtendActivity();\r
+ ExtActivity ea = new ExtActivity();\r
ea.setContent(content);\r
ea.setDescription(description);\r
ea.setDisplayName(displayName);\r
Code Review / sdc / sdc-workflow-designer.git / commitdiff