Clean the config files.

[aai/esr-server.git] / esr-mgr / src / main / java / org / onap / aai / esr / ExtsysAppConfiguration.java

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java
index 862c6a5..f0b6097 100644 (file)
--- a/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java
@@ -18,14 +18,13 @@ package org.onap.aai.esr;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.dropwizard.Configuration;
-import io.dropwizard.db.DataSourceFactory;
 import org.hibernate.validator.constraints.NotEmpty;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import org.jvnet.hk2.annotations.Service;
 
 
+import javax.validation.Valid;
 
+@Service
 public class ExtsysAppConfiguration extends Configuration {
   @NotEmpty
   private String template;
@@ -34,10 +33,13 @@ public class ExtsysAppConfiguration extends Configuration {
   private String defaultName = "ONAP-A&AI-ESR";
 
   @NotEmpty
-  private String msbIp;
+  private String msbDiscoveryIp;
   
   @NotEmpty
-  private int msbPort;
+  private String msbDiscoveryPort;
+  
+  @NotEmpty
+  private String registByHand;
   
   @NotEmpty
   private String msbServerAddr;
@@ -66,25 +68,15 @@ public class ExtsysAppConfiguration extends Configuration {
   }
   
   @JsonProperty
-  public String getMsbIp() {
-    return msbIp;
-  }
-  
-  @JsonProperty
-  public String setMsbIp() {
-    return msbIp;
+  public String getMsbDiscoveryIp() {
+    return msbDiscoveryIp;
   }
   
   @JsonProperty
-  public int getMsbPort() {
-    return msbPort;
+  public String setMsbDiscoveryIp() {
+    return msbDiscoveryIp;
   }
   
-  @JsonProperty
-  public int setMsbPort() {
-    return msbPort;
-  }
-
   @JsonProperty
   public String getMsbServerAddr() {
     return msbServerAddr;
@@ -103,4 +95,25 @@ public class ExtsysAppConfiguration extends Configuration {
   public void setServiceIp(String serviceIp) {
     this.serviceIp = serviceIp;
   }
+
+  @JsonProperty
+  public String getRegistByHand() {
+    return registByHand;
+  }
+
+  @JsonProperty
+  public void setRegistByHand(String registByHand) {
+    this.registByHand = registByHand;
+  }
+
+  @JsonProperty
+  public void setMsbDiscoveryPort(String msbDiscoveryPort) {
+    this.msbDiscoveryPort = msbDiscoveryPort;
+  }
+  
+  @JsonProperty
+  public String getMsbDiscoveryPort() {
+    return msbDiscoveryPort;
+  }
+
 }