Refactor.

Code Optimization

Issue-ID: SDC-1079

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

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 600ec8c..d5bbdd4 100644 (file)
--- 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
@@ -46,12 +46,12 @@ import io.swagger.annotations.ApiResponses;
 @Path("/ext-activities")
 @Api(tags = {"Workflow Modeler"})
 public class ExtendActivityResource {
+  private static final Logger LOGGER = LoggerFactory.getLogger(ExtendActivityResource.class);
+  
   /** */
   private static final String EXT_ACTIVITIES_DISPLAY_INFO_FILE_NAME = "ext-activities-display-info.json";
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ExtendActivityResource.class);
-
-  private static final String EXT_ACTIVITIES_FILE_NAME = "..\\distribution\\src\\main\\assembly\\ext-activities.json";
+  private static final String EXT_ACTIVITIES_FILE_NAME = "ext-activities.json";
 
   /**
    * test function.
@@ -88,7 +88,7 @@ public class ExtendActivityResource {
    * @return
    * @throws IOException
    */
-  private ExtendActivity[] retriveExtActivites(String sence) throws IOException {
+  protected ExtendActivity[] retriveExtActivites(String sence) throws IOException {
     String json = FileCommonUtils.readString(EXT_ACTIVITIES_FILE_NAME);
     return JsonUtils.fromJson(json, ExtendActivity[].class);
   }

diff --git a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/resources/ExtendActivityResourceTest.java b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/resources/ExtendActivityResourceTest.java
index 18a8597..060008b 100644 (file)
--- a/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/resources/ExtendActivityResourceTest.java
+++ b/sdc-workflow-designer-server/src/test/java/org/onap/sdc/workflowdesigner/resources/ExtendActivityResourceTest.java
@@ -13,8 +13,6 @@ package org.onap.sdc.workflowdesigner.resources;
 \r
 import static org.junit.Assert.assertEquals;\r
 \r
-import javax.ws.rs.core.Response;\r
-\r
 import org.junit.After;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
@@ -26,6 +24,7 @@ import org.onap.sdc.workflowdesigner.utils.JsonUtils;
  *\r
  */\r
 public class ExtendActivityResourceTest {\r
+  private static final String EXT_ACTIVITIES_FILE_NAME = "..\\distribution\\src\\main\\assembly\\ext-activities.json";\r
 \r
   /**\r
    * @throws java.lang.Exception\r
@@ -40,14 +39,14 @@ public class ExtendActivityResourceTest {
   public void tearDown() throws Exception {}\r
 \r
   /**\r
-   * Test method for {@link org.onap.sdc.workflowdesigner.resources.ExtendActivityResource#getExtActivities(java.lang.String)}.\r
+   * Test method for {@link org.onap.sdc.workflowdesigner.resources.ExtendActivityResource#retriveExtActivites(java.lang.String)}.\r
    */\r
   @Test\r
-  public void testGetExtActivities() {\r
-    ExtendActivityResource resource = new ExtendActivityResource();\r
+  public void testRetriveExtActivites() {\r
     try {\r
-      Response response = resource.getExtActivities("test");\r
-      ExtendActivity[] extActivities = (ExtendActivity[]) response.getEntity();\r
+      String json = FileCommonUtils.readString(EXT_ACTIVITIES_FILE_NAME);\r
+      ExtendActivity[] extActivities = JsonUtils.fromJson(json, ExtendActivity[].class);\r
+      \r
       FileCommonUtils.write("test.json", JsonUtils.toJson(extActivities));\r
       assertEquals(extActivities.length == 0, false);\r
     } catch (Exception e) {\r