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>
---
 .../onap/sdc/workflowdesigner/SDCServiceProxyInfo.java    | 15 +++++++++++++++
 .../workflowdesigner/WorkflowDesignerConfiguration.java   |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'sdc-workflow-designer-server/src/main')

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