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>

5 files changed, 22 insertions, 14 deletions

diff --git a/sdc-workflow-designer-server/pom.xml b/sdc-workflow-designer-server/pom.xml
index 1713de0e..6ecf11c3 100644
--- 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 bd99ca46..1df2c2b1 100644
--- 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;

 

   private boolean collapse;

+  

+  /**

+   * 

+   */

+  public CategoryData() {

+    super();

+  }

+

+  /**

+   * @param displayName

+   */

+  public CategoryData(I18nString displayName) {

+    super();

+    this.displayName = displayName;

+  }

 

   /**

    * @return the displayName

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 83a77953..5c96cea8 100644
--- 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 @@
  */

 package org.onap.sdc.workflowdesigner.resources.entity;

 

+import java.util.HashMap;

 import java.util.Map;

 

 /**

  *

  */

 public class ExtActivityDisplayInfo {

-  private Map<String, NodeCategory> nodes;

+  private Map<String, NodeCategory> nodes = new HashMap<>();

 

-  private Map<String, CategoryData> categoryData;

+  private Map<String, CategoryData> categoryData = new HashMap<>();

 

   /**

    * @return the nodes

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 6ae8ffa1..0fb13ff6 100644
--- 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 @@
  */

 package org.onap.sdc.workflowdesigner;

 

-import static org.junit.Assert.*;

+import static org.junit.Assert.assertEquals;

 

-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/planwriter/BpmnPlanArtefactWriterTest.java b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/planwriter/BpmnPlanArtefactWriterTest.java
index 125dd15c..7236d6e6 100644
--- 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

     public void testWritePlan() throws Exception {

         BpmnPlanArtefactWriter writer = new BpmnPlanArtefactWriter(mockProcss());

-//        String result = writer.completePlanTemplate();

-//        assertEquals(result, getResult());

-     // TODO for Nexus-IQ

-        assertEquals(true, writer != null);

+        String result = writer.completePlanTemplate();

+        assertEquals(result, getResult());

     }

 

     private Process mockProcss() {