From 1ab776275ea432950bc7983d066e7a832d0bbc4c Mon Sep 17 00:00:00 2001
From: lizi00164331 <li.zi30@zte.com.cn>
Date: Tue, 29 Aug 2017 10:16:09 +0800
Subject: [PATCH] Remove the lombok dependency.

lombok dependency is not allowed in LF.

Change-Id: I5693dadc521a14f015e26276e71ca8e0f4cb19a3
Issue-ID: AAI-234
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>
---
 esr-core/esr-mgr/pom.xml                           |  5 --
 .../esr/externalservice/entity/ServiceNode.java    | 38 +++++++++---
 .../entity/ServiceRegisterEntity.java              | 71 +++++++++++++++++++---
 esr-parent/esrparent/pom.xml                       | 10 +--
 4 files changed, 93 insertions(+), 31 deletions(-)

diff --git a/esr-core/esr-mgr/pom.xml b/esr-core/esr-mgr/pom.xml
index 37f2497..8e03177 100644
--- a/esr-core/esr-mgr/pom.xml
+++ b/esr-core/esr-mgr/pom.xml
@@ -137,11 +137,6 @@
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-hibernate</artifactId>
         </dependency>
-        <!-- lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>            
-        </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-jersey2-jaxrs</artifactId>
diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/ServiceNode.java b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/ServiceNode.java
index 13b9ea3..f79f584 100644
--- a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/ServiceNode.java
+++ b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/ServiceNode.java
@@ -15,18 +15,38 @@
  */
 package org.onap.aai.esr.externalservice.entity;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class ServiceNode {
+  
   private String ip;
+  
   private String port;
+  
   private int ttl;
+
+  public String getIp() {
+    return ip;
+  }
+
+  public void setIp(String ip) {
+    this.ip = ip;
+  }
+
+  public String getPort() {
+    return port;
+  }
+
+  public void setPort(String port) {
+    this.port = port;
+  }
+
+  public int getTtl() {
+    return ttl;
+  }
+
+  public void setTtl(int ttl) {
+    this.ttl = ttl;
+  }
+  
+  
 }
diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/ServiceRegisterEntity.java b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/ServiceRegisterEntity.java
index 50fd9f1..12ab147 100644
--- a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/ServiceRegisterEntity.java
+++ b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/ServiceRegisterEntity.java
@@ -16,18 +16,10 @@
 
 package org.onap.aai.esr.externalservice.entity;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
 
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
+
 public class ServiceRegisterEntity {
   private String serviceName;
   private String version;
@@ -36,6 +28,7 @@ public class ServiceRegisterEntity {
   private String visualRange;
   private ArrayList<ServiceNode> nodes = new ArrayList<ServiceNode>();
 
+  
   /**
    * set service entity.
    * 
@@ -55,5 +48,65 @@ public class ServiceRegisterEntity {
     nodes.add(node);
   }
 
+
+  public String getServiceName() {
+    return serviceName;
+  }
+
+
+  public void setServiceName(String serviceName) {
+    this.serviceName = serviceName;
+  }
+
+
+  public String getVersion() {
+    return version;
+  }
+
+
+  public void setVersion(String version) {
+    this.version = version;
+  }
+
+
+  public String getUrl() {
+    return url;
+  }
+
+
+  public void setUrl(String url) {
+    this.url = url;
+  }
+
+
+  public String getProtocol() {
+    return protocol;
+  }
+
+
+  public void setProtocol(String protocol) {
+    this.protocol = protocol;
+  }
+
+
+  public String getVisualRange() {
+    return visualRange;
+  }
+
+
+  public void setVisualRange(String visualRange) {
+    this.visualRange = visualRange;
+  }
+
+
+  public ArrayList<ServiceNode> getNodes() {
+    return nodes;
+  }
+
+
+  public void setNodes(ArrayList<ServiceNode> nodes) {
+    this.nodes = nodes;
+  }
+
 }
 
diff --git a/esr-parent/esrparent/pom.xml b/esr-parent/esrparent/pom.xml
index 9c77932..c5395ee 100644
--- a/esr-parent/esrparent/pom.xml
+++ b/esr-parent/esrparent/pom.xml
@@ -32,11 +32,10 @@
     <properties>
         <dropwizard.version>0.8.0</dropwizard.version>
         <swagger.version>1.5.3</swagger.version>
-        <lombok.version>1.16.4</lombok.version>
         <jersey.version>2.16</jersey.version>
         <jaxrs.consumer.version>5.0</jaxrs.consumer.version>
         <gson.version>2.2.4</gson.version>
-        <lombok.version>1.16.4</lombok.version>
+        <!--<lombok.version>1.16.4</lombok.version>-->
         <mysql-connector-java.version>5.1.18</mysql-connector-java.version>
         <junit.version>4.10</junit.version>
         <org.powermock.version>1.4.10</org.powermock.version>
@@ -66,12 +65,7 @@
                 <artifactId>swagger-jersey2-jaxrs</artifactId>
                 <version>${swagger.version}</version>
             </dependency> 
-            <!-- lombok -->
-            <dependency>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok</artifactId>
-                <version>${lombok.version}</version>
-            </dependency>
+
             <!-- jersey -->
             <dependency>
                 <groupId>org.glassfish.jersey.core</groupId>
-- 
2.16.6