Not Serialize the Null Fields

Not Serialize the Null Fields, like 'clazz' to script task, 'script format'/'script' to service task.

Issue-ID: SDC-1236

Change-Id: I50ea943a3863c1164d9eede33768d0433d662b2b
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>

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 70d5992..2a49ae0 100644 (file)
--- 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,12 +13,15 @@ package org.onap.sdc.workflowdesigner.resources.entity;
 \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
   @JsonProperty(value="class") // for dropwizard's Jackson\r
   @SerializedName("class")  // for Gson\r

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 4666171..5a798ee 100644 (file)
--- 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 @@
  */\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
+@JsonInclude(Include.NON_NULL)\r
 public class ExtActivity {\r
   private String id;\r
   \r