From faf3aa64285dda88f2545c7d777cc70601354137 Mon Sep 17 00:00:00 2001
From: YuanHu <yuan.hu1@zte.com.cn>
Date: Wed, 21 Mar 2018 17:25:44 +0800
Subject: Fixed the Issue Checked by Nexus IQ.

Clean up excess dependencies
Change the version of dependencies.

Issue-ID: SDC-1127

Change-Id: I7b87eb22f44bf68bf052b57bd17c08c0f146d5cb
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
---
 sdc-workflow-designer-server/pom.xml               | 36 ++++++----------------
 .../sdc/workflowdesigner/SDCServiceProxyInfo.java  | 15 +++++++++
 .../WorkflowDesignerConfiguration.java             |  4 ++-
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/sdc-workflow-designer-server/pom.xml b/sdc-workflow-designer-server/pom.xml
index 0871c5a9..2b8bfb93 100644
--- a/sdc-workflow-designer-server/pom.xml
+++ b/sdc-workflow-designer-server/pom.xml
@@ -26,16 +26,15 @@
     <packaging>jar</packaging>
     
     <properties>
-        <jackson.version>2.9.1</jackson.version>
-        <gson.version>2.2.4</gson.version>
-        <jaxrs.consumer.version>5.0</jaxrs.consumer.version>
         <velocity.version>1.7</velocity.version>
-        <junit.version>4.10</junit.version>
-        <dropwizard.version>1.2.4</dropwizard.version>
-        <swagger.version>1.5.18</swagger.version>
-        <jersey.version>2.16</jersey.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>
+        <junit.version>4.10</junit.version>
     </properties>
     
     <build>
@@ -113,11 +112,11 @@
             <artifactId>dropwizard-assets</artifactId>
             <version>${dropwizard.version}</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-migrations</artifactId>
             <version>${dropwizard.version}</version>
-        </dependency>
+        </dependency-->
         
         <!-- swagger -->
         <dependency>
@@ -149,17 +148,6 @@
             <version>${commons-io.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        
         <!-- gson -->
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -171,15 +159,9 @@
         <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>
-        
+
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
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 a4853f73..e8507101 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,19 +11,29 @@
  */
 package org.onap.sdc.workflowdesigner;
 
+import javax.validation.constraints.NotNull;
+
+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;
 
   /**
    * @return the serviceAddr
    */
+  @JsonProperty
   public String getServiceAddr() {
     return serviceAddr;
   }
@@ -31,6 +41,7 @@ public class SDCServiceProxyInfo {
   /**
    * @param serviceAddr the serviceAddr to set
    */
+  @JsonProperty
   public void setServiceAddr(String serviceAddr) {
     this.serviceAddr = serviceAddr;
   }
@@ -38,6 +49,7 @@ public class SDCServiceProxyInfo {
   /**
    * @return the xEcompInstanceId
    */
+  @JsonProperty
   public String getxEcompInstanceId() {
     return xEcompInstanceId;
   }
@@ -45,6 +57,7 @@ public class SDCServiceProxyInfo {
   /**
    * @param xEcompInstanceId the xEcompInstanceId to set
    */
+  @JsonProperty
   public void setxEcompInstanceId(String xEcompInstanceId) {
     this.xEcompInstanceId = xEcompInstanceId;
   }
@@ -52,6 +65,7 @@ public class SDCServiceProxyInfo {
   /**
    * @return the authorization
    */
+  @JsonProperty
   public String getAuthorization() {
     return authorization;
   }
@@ -59,6 +73,7 @@ public class SDCServiceProxyInfo {
   /**
    * @param authorization the authorization to set
    */
+  @JsonProperty
   public void setAuthorization(String authorization) {
     this.authorization = authorization;
   }
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 6ce2a1e2..28c96c71 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
@@ -12,6 +12,8 @@
 
 package org.onap.sdc.workflowdesigner;
 
+import javax.validation.constraints.NotNull;
+
 import org.hibernate.validator.constraints.NotEmpty;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -25,7 +27,7 @@ public class WorkflowDesignerConfiguration extends Configuration {
   @NotEmpty
   private String defaultName = "Workflow Designer";
   
-  @NotEmpty
+  @NotNull
   private SDCServiceProxyInfo sdcServiceProxy;
 
   @JsonProperty
-- 
cgit 1.2.3-korg