diff options
17 files changed, 258 insertions, 327 deletions
diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..67a5857a --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,12 @@ +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 + +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.
\ No newline at end of file diff --git a/distribution/src/main/assembly/ext-activities-display-info.json b/distribution/src/main/assembly/ext-activities-display-info.json index 8a5e10af..72056a5d 100644 --- a/distribution/src/main/assembly/ext-activities-display-info.json +++ b/distribution/src/main/assembly/ext-activities-display-info.json @@ -4,8 +4,6 @@ }, "apds_service": { }, - "apds_rest": { - }, "apds_scriptA": { "category": "aaa" }, @@ -15,10 +13,7 @@ "apds_serviceA": { "category": "aaa" }, - "apds_restA": { - "category": "aaa" - }, - "apds_restB": { + "apds_serviceB": { "category": "aaa" } }, @@ -31,4 +26,4 @@ "collapse": true } } -}
\ No newline at end of file +} diff --git a/distribution/src/main/assembly/ext-activities.json b/distribution/src/main/assembly/ext-activities.json index 0eb1f0e1..6defc343 100644 --- a/distribution/src/main/assembly/ext-activities.json +++ b/distribution/src/main/assembly/ext-activities.json @@ -21,32 +21,6 @@ } }, { - "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": { "zh_CN": "默认脚本", @@ -70,12 +44,12 @@ { "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": { @@ -91,12 +65,12 @@ { "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": { @@ -112,12 +86,12 @@ { "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": { @@ -126,7 +100,7 @@ "height": 56 }, "content": { - "class": "com.zte.ums.workflow.activitiext.restservicetask.HttpUtil", + "class": "org.onap.sdc.workflow.task.StopVNFDelegate", "inputs": { "param1": { "type": "string", @@ -176,187 +150,69 @@ } }, { - "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 +] diff --git a/distribution/src/main/assembly/temp_workflow.json b/distribution/src/main/assembly/temp_workflow.json index f12f892e..3b3fa1c1 100644 --- a/distribution/src/main/assembly/temp_workflow.json +++ b/distribution/src/main/assembly/temp_workflow.json @@ -5,109 +5,121 @@ "data": {
"nodes": [
{
- "id": "node0",
+ "id": "startEvent",
"type": "startEvent",
"name": "Start",
"parentId": "root",
"position": {
- "left": 99,
- "top": 131,
+ "left": 73,
+ "top": 160,
"width": 56,
"height": 56
},
"connection": [
{
- "sourceRef": "node0",
- "targetRef": "serviceTask"
+ "sourceRef": "startEvent",
+ "targetRef": "scriptTask"
}
],
- "parameters": [
- {
- "name": "aaa",
- "value": "a111",
- "valueSource": "string",
- "type": "string",
- "required": false,
- "show": true,
- "errorMsg": ""
- },
+ "parameters": []
+ },
+ {
+ "id": "scriptTask",
+ "type": "scriptTask",
+ "typeId": "apds_scriptA",
+ "icon": "apds_script",
+ "name": "Stop traffic",
+ "parentId": "root",
+ "position": {
+ "left": 175,
+ "top": 160,
+ "width": 56,
+ "height": 56
+ },
+ "connection": [
{
- "name": "bbb",
- "value": "b111",
- "valueSource": "string",
- "type": "string",
- "required": false,
- "show": true,
- "errorMsg": ""
+ "sourceRef": "scriptTask",
+ "targetRef": "scriptTask_2"
}
- ]
+ ],
+ "scriptFormat": "JavaScript",
+ "script": "abc"
},
{
- "id": "node2",
- "type": "endEvent",
- "name": "End",
+ "id": "scriptTask_2",
+ "type": "scriptTask",
+ "typeId": "apds_scriptB",
+ "icon": "apds_script",
+ "name": "Drain traffic",
"parentId": "root",
"position": {
- "left": 459,
- "top": 131,
+ "left": 289,
+ "top": 160,
"width": 56,
"height": 56
},
- "connection": []
+ "connection": [
+ {
+ "sourceRef": "scriptTask_2",
+ "targetRef": "serviceTask"
+ }
+ ],
+ "scriptFormat": "Groovy",
+ "script": "xyz"
},
{
"id": "serviceTask",
"type": "serviceTask",
"typeId": "apds_serviceA",
"icon": "apds_service",
- "name": "Java Task",
+ "name": "Stop VNF",
"parentId": "root",
"position": {
- "left": 232,
- "top": 131,
+ "left": 392,
+ "top": 160,
"width": 56,
"height": 56
},
"connection": [
{
"sourceRef": "serviceTask",
- "targetRef": "scriptTask"
+ "targetRef": "serviceTask_2"
}
],
- "className": "org.onap.sdc.workflowdesigner.JavaTask",
+ "className": "",
"inputs": [
{
"name": "param1",
+ "value": "default",
"valueSource": "string",
"type": "string",
"required": false,
"show": true,
- "errorMsg": "",
- "value": "a111"
+ "errorMsg": ""
},
{
"name": "param2",
+ "value": null,
"valueSource": "string",
"type": "string",
"required": true,
"show": true,
- "errorMsg": "",
- "value": "b111"
+ "errorMsg": ""
},
{
"name": "param3",
+ "value": "value3",
"valueSource": "string",
"type": "string",
"required": true,
"show": true,
- "errorMsg": "",
- "value": "c111"
+ "errorMsg": ""
}
],
"outputs": [
{
"name": "out1",
- "value": "",
+ "value": null,
"valueSource": "string",
"type": "string",
"required": false,
@@ -117,27 +129,61 @@ ]
},
{
- "id": "scriptTask",
- "type": "scriptTask",
- "typeId": "apds_scriptB",
- "icon": "apds_script",
- "name": "Groovy Task",
+ "id": "serviceTask_2",
+ "type": "serviceTask",
+ "typeId": "apds_serviceB",
+ "icon": "apds_service",
+ "name": "Create VNF",
"parentId": "root",
"position": {
- "left": 335,
- "top": 131,
+ "left": 500,
+ "top": 160,
"width": 56,
"height": 56
},
"connection": [
{
- "sourceRef": "scriptTask",
- "targetRef": "node2"
+ "sourceRef": "serviceTask_2",
+ "targetRef": "serviceTask_3"
+ }
+ ]
+ },
+ {
+ "id": "serviceTask_3",
+ "type": "serviceTask",
+ "typeId": "apds_service",
+ "icon": "apds_service",
+ "name": "Start VNF",
+ "parentId": "root",
+ "position": {
+ "left": 620,
+ "top": 160,
+ "width": 56,
+ "height": 56
+ },
+ "connection": [
+ {
+ "sourceRef": "serviceTask_3",
+ "targetRef": "endEvent"
}
],
- "scriptFormat": "Groovy",
- "script": "xyz"
+ "className": "",
+ "inputs": [],
+ "outputs": []
+ },
+ {
+ "id": "endEvent",
+ "type": "endEvent",
+ "name": "End",
+ "parentId": "root",
+ "position": {
+ "left": 744,
+ "top": 160,
+ "width": 56,
+ "height": 56
+ },
+ "connection": []
}
]
}
-}
\ No newline at end of file +}
diff --git a/sdc-workflow-designer-server/pom.xml b/sdc-workflow-designer-server/pom.xml index 6ecf11c3..8bfed82a 100644 --- a/sdc-workflow-designer-server/pom.xml +++ b/sdc-workflow-designer-server/pom.xml @@ -26,15 +26,18 @@ <packaging>jar</packaging> <properties> - <velocity.version>1.7</velocity.version> - <commons-io.version>2.4</commons-io.version> - <dom4j.version>1.6.1</dom4j.version> <dropwizard.version>1.2.2</dropwizard.version> <swagger.version>1.5.3</swagger.version> <jersey.version>2.16</jersey.version> <jaxrs.consumer.version>5.0</jaxrs.consumer.version> <gson.version>2.2.4</gson.version> + <hibernate-validator.version>5.4.2.Final</hibernate-validator.version> + <jackson-databind.version>2.9.2</jackson-databind.version> <junit.version>4.10</junit.version> + <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> </properties> <build> @@ -106,7 +109,28 @@ <groupId>io.dropwizard</groupId> <artifactId>dropwizard-core</artifactId> <version>${dropwizard.version}</version> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson-databind.version}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>${hibernate-validator.version}</version> </dependency> + <dependency> <groupId>io.dropwizard</groupId> <artifactId>dropwizard-assets</artifactId> @@ -117,6 +141,16 @@ <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-jersey2-jaxrs</artifactId> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-xml</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + </exclusions> <version>${swagger.version}</version> </dependency> @@ -143,6 +177,19 @@ <version>${commons-io.version}</version> </dependency> + <!-- consumer --> + <dependency> + <groupId>com.eclipsesource.jaxrs</groupId> + <artifactId>consumer</artifactId> + <exclusions> + <exclusion> + <groupId>com.eclipsesource.jaxrs</groupId> + <artifactId>jersey-all</artifactId> + </exclusion> + </exclusions> + <version>${jaxrs.consumer.version}</version> + </dependency> + <!-- gson --> <dependency> <groupId>com.google.code.gson</groupId> @@ -150,17 +197,21 @@ <version>${gson.version}</version> </dependency> - <!-- consumer --> - <dependency> - <groupId>com.eclipsesource.jaxrs</groupId> - <artifactId>consumer</artifactId> - <version>${jaxrs.consumer.version}</version> - </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> diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/SDCServiceProxyInfo.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/SDCServiceProxyInfo.java index caa88576..df4d0caa 100644 --- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/SDCServiceProxyInfo.java +++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/SDCServiceProxyInfo.java @@ -11,21 +11,16 @@ */
package org.onap.sdc.workflowdesigner;
-import org.hibernate.validator.constraints.NotEmpty;
-
import com.fasterxml.jackson.annotation.JsonProperty;
/**
*
*/
public class SDCServiceProxyInfo {
- @NotEmpty
private String serviceAddr;
- @NotEmpty
private String xEcompInstanceId;
- @NotEmpty
private String authorization;
/**
diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/WorkflowDesignerApp.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/WorkflowDesignerApp.java index e5b065ec..34a17e70 100644 --- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/WorkflowDesignerApp.java +++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/WorkflowDesignerApp.java @@ -12,7 +12,6 @@ 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; @@ -61,8 +60,6 @@ public class WorkflowDesignerApp extends Application<WorkflowDesignerConfigurati // 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); diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfiguration.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfiguration.java index cde361a8..381e1673 100644 --- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfiguration.java +++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfiguration.java @@ -14,20 +14,15 @@ package org.onap.sdc.workflowdesigner; import javax.validation.constraints.NotNull; -import org.hibernate.validator.constraints.NotEmpty; - import com.fasterxml.jackson.annotation.JsonProperty; import io.dropwizard.Configuration; public class WorkflowDesignerConfiguration extends Configuration { - @NotEmpty private String template; - @NotEmpty private String defaultName = "Workflow Designer"; - @NotEmpty private String adapterType; @NotNull diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/externalservice/sdc/entity/ActivityContent.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/externalservice/sdc/entity/ActivityContent.java index e97fd8e2..66208a2c 100644 --- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/externalservice/sdc/entity/ActivityContent.java +++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/externalservice/sdc/entity/ActivityContent.java @@ -11,32 +11,21 @@ */
package org.onap.sdc.workflowdesigner.externalservice.sdc.entity;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
/**
*
*/
public class ActivityContent {
- @SerializedName("class")
- private String clazz;
+ @JsonProperty(value="class") // for dropwizard's Jackson
+ @SerializedName("class") // for Gson
+ public String clazz;
private String scriptFormat;
private String script;
- /**
- * @return the clazz
- */
- public String getClazz() {
- return clazz;
- }
-
- /**
- * @param clazz the clazz to set
- */
- public void setClazz(String clazz) {
- this.clazz = clazz;
- }
/**
* @return the scriptFormat
diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/externalservice/sdc/entity/ActivitySpec.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/externalservice/sdc/entity/ActivitySpec.java index 2ce45fa0..35a1a36e 100644 --- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/externalservice/sdc/entity/ActivitySpec.java +++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/externalservice/sdc/entity/ActivitySpec.java @@ -25,7 +25,7 @@ public class ActivitySpec { private String type;
- private ActivityContent content;
+ private ActivityContent content = new ActivityContent();
private String[] categoryList;
diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/ExtendActivityResource.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/ExtendActivityResource.java index 46fef111..99e2f28a 100644 --- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/ExtendActivityResource.java +++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/ExtendActivityResource.java @@ -160,7 +160,8 @@ public class ExtendActivityResource { */ private Content buildContent(ActivitySpec activitySpec) { Content content = new Content(); - content.setClass(activitySpec.getContent().getClazz()); +// 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())); diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/Content.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/Content.java index 5a246624..2a49ae07 100644 --- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/Content.java +++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/Content.java @@ -13,14 +13,19 @@ package org.onap.sdc.workflowdesigner.resources.entity; import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
/**
*
*/
+@JsonInclude(Include.NON_NULL)
public class Content {
- @SerializedName("class")
- private String clazz;
+ @JsonProperty(value="class") // for dropwizard's Jackson
+ @SerializedName("class") // for Gson
+ public String clazz;
private String script;
@@ -29,20 +34,7 @@ public class Content { private Map<String, InputOutput> inputs;
private Map<String, InputOutput> outputs;
-
- /**
- * @return the clazz
- */
- public String getClazz() {
- return clazz;
- }
-
- /**
- * @param clazz the clazz to set
- */
- public void setClass(String clazz) {
- this.clazz = clazz;
- }
+
/**
* @return the script
diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/ExtActivity.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/ExtActivity.java index 46661713..5a798ee2 100644 --- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/ExtActivity.java +++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/ExtActivity.java @@ -11,9 +11,13 @@ */
package org.onap.sdc.workflowdesigner.resources.entity;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
/**
*
*/
+@JsonInclude(Include.NON_NULL)
public class ExtActivity {
private String id;
diff --git a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfigurationTest.java b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfigurationTest.java index 12e18531..0a154ed1 100644 --- a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfigurationTest.java +++ b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/WorkflowDesignerConfigurationTest.java @@ -11,11 +11,8 @@ */
package org.onap.sdc.workflowdesigner;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
-import javax.validation.constraints.NotNull;
-
-import org.hibernate.validator.constraints.NotEmpty;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/externalservice/sdc/entity/ActivityContentTest.java b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/externalservice/sdc/entity/ActivityContentTest.java index 2ede2611..4aa2dd0f 100644 --- a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/externalservice/sdc/entity/ActivityContentTest.java +++ b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/externalservice/sdc/entity/ActivityContentTest.java @@ -39,16 +39,16 @@ public class ActivityContentTest { */
@Test
public void testToString() {
- String clazz = "clazz";
+// String clazz = "clazz";
String script = "script";
String scriptFormat = "scriptFormat";
ActivityContent ac = new ActivityContent();
- ac.setClazz(clazz);
+// ac.setClass(clazz);
ac.setScript(script);
ac.setScriptFormat(scriptFormat );
- assertEquals(clazz, ac.getClazz());
+// assertEquals(clazz, ac.getClazz());
assertEquals(script, ac.getScript());
assertEquals(scriptFormat, ac.getScriptFormat());
}
diff --git a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/resources/entity/ContentTest.java b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/resources/entity/ContentTest.java index 58738bc0..1c6612ea 100644 --- a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/resources/entity/ContentTest.java +++ b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/resources/entity/ContentTest.java @@ -19,6 +19,7 @@ import java.util.Map; import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.onap.sdc.workflowdesigner.utils.JsonUtils;
/**
*
@@ -39,24 +40,34 @@ public class ContentTest { @Test
public void test() {
- String clazz = "clazz";
+// String clazz = "clazz";
String script = "script";
String scriptFormat = "scriptFormat";
Map<String, InputOutput> inputs = new HashMap<String, InputOutput>();
Map<String, InputOutput> outputs = new HashMap<String, InputOutput>();
Content c = new Content();
- c.setClass(clazz);
+// c.setClass(clazz);
c.setInputs(inputs);
c.setOutputs(outputs);
c.setScript(script);
c.setScriptFormat(scriptFormat);
- assertEquals(clazz, c.getClazz());
+// assertEquals(clazz, c.getClazz());
assertEquals(inputs, c.getInputs());
assertEquals(outputs, c.getOutputs());
assertEquals(script, c.getScript());
assertEquals(scriptFormat, c.getScriptFormat());
}
+
+ @Test
+ public void testGson() {
+ String json = "{\r\n" +
+ " \"class\": \"aaaa\",\r\n" +
+ " \"inputs\": {}\r\n" +
+ " }";
+ Content content = JsonUtils.fromJson(json, Content.class);
+ assertNotNull(content);
+ }
}
diff --git a/sdc-workflow-designer-ui/package.json b/sdc-workflow-designer-ui/package.json index b160f9e0..67a28e1a 100644 --- a/sdc-workflow-designer-ui/package.json +++ b/sdc-workflow-designer-ui/package.json @@ -1,17 +1,7 @@ { "name": "workflow-modeler", "version": "1.0.0", - "license": "MIT", - "licenses": [ - { - "type": "Apache-2.0", - "url": "http://www.apache.org/licenses/LICENSE-2.0.html" - }, - { - "type": "Eclipse Public License-1.0", - "url": "http://www.eclipse.org/legal/epl-v10.html" - } - ], + "license": "SEE LICENSE IN LICENSE.TXT", "scripts": { "ng": "ng", "start": "ng serve --host localhost --disable-host-check true", |