diff options
Diffstat (limited to 'sdc-workflow-designer-server')
12 files changed, 98 insertions, 66 deletions
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);
+ }
}
|