Fix Nexus IQ issues.

Change the 'velocity' plugin in order to fix some Nexus IQ issues.
Code optimization

Issue-ID: SDC-1211

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

diff --git a/sdc-workflow-designer-server/pom.xml b/sdc-workflow-designer-server/pom.xml
index 1713de0..6ecf11c 100644 (file)
--- a/sdc-workflow-designer-server/pom.xml
+++ b/sdc-workflow-designer-server/pom.xml
@@ -157,15 +157,10 @@
             <version>${jaxrs.consumer.version}</version>
         </dependency>
 
-        <!--dependency>
+        <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
             <version>${velocity.version}</version>
-        </dependency-->
-        <dependency>
-            <groupId>velocity</groupId>
-            <artifactId>velocity</artifactId>
-            <version>1.4</version>
         </dependency>
         
         <dependency>

diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/CategoryData.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/CategoryData.java
index bd99ca4..1df2c2b 100644 (file)
--- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/CategoryData.java
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/CategoryData.java
@@ -18,6 +18,21 @@ public class CategoryData {
   private I18nString displayName;\r
 \r
   private boolean collapse;\r
+  \r
+  /**\r
+   * \r
+   */\r
+  public CategoryData() {\r
+    super();\r
+  }\r
+\r
+  /**\r
+   * @param displayName\r
+   */\r
+  public CategoryData(I18nString displayName) {\r
+    super();\r
+    this.displayName = displayName;\r
+  }\r
 \r
   /**\r
    * @return the displayName\r

diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/ExtActivityDisplayInfo.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/ExtActivityDisplayInfo.java
index 83a7795..5c96cea 100644 (file)
--- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/ExtActivityDisplayInfo.java
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/resources/entity/ExtActivityDisplayInfo.java
@@ -11,15 +11,16 @@
  */\r
 package org.onap.sdc.workflowdesigner.resources.entity;\r
 \r
+import java.util.HashMap;\r
 import java.util.Map;\r
 \r
 /**\r
  *\r
  */\r
 public class ExtActivityDisplayInfo {\r
-  private Map<String, NodeCategory> nodes;\r
+  private Map<String, NodeCategory> nodes = new HashMap<>();\r
 \r
-  private Map<String, CategoryData> categoryData;\r
+  private Map<String, CategoryData> categoryData = new HashMap<>();\r
 \r
   /**\r
    * @return the nodes\r

diff --git a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/SDCServiceProxyInfoTest.java b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/SDCServiceProxyInfoTest.java
index 6ae8ffa..0fb13ff 100644 (file)
--- a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/SDCServiceProxyInfoTest.java
+++ b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/SDCServiceProxyInfoTest.java
@@ -11,9 +11,8 @@
  */\r
 package org.onap.sdc.workflowdesigner;\r
 \r
-import static org.junit.Assert.*;\r
+import static org.junit.Assert.assertEquals;\r
 \r
-import org.hibernate.validator.constraints.NotEmpty;\r
 import org.junit.After;\r
 import org.junit.Before;\r
 import org.junit.Test;\r

diff --git a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/planwriter/BpmnPlanArtefactWriterTest.java b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/planwriter/BpmnPlanArtefactWriterTest.java
index 125dd15..7236d6e 100644 (file)
--- a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/planwriter/BpmnPlanArtefactWriterTest.java
+++ b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/planwriter/BpmnPlanArtefactWriterTest.java
@@ -27,10 +27,8 @@ public class BpmnPlanArtefactWriterTest {
     @Test\r
     public void testWritePlan() throws Exception {\r
         BpmnPlanArtefactWriter writer = new BpmnPlanArtefactWriter(mockProcss());\r
-//        String result = writer.completePlanTemplate();\r
-//        assertEquals(result, getResult());\r
-     // TODO for Nexus-IQ\r
-        assertEquals(true, writer != null);\r
+        String result = writer.completePlanTemplate();\r
+        assertEquals(result, getResult());\r
     }\r
 \r
     private Process mockProcss() {\r