X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2FExtsysAppConfiguration.java;h=4b64cf0457829594c277f0619ff125ed8384331a;hp=83bd83192f59a1e901d2fdbc1b8f35b2fd8b22b2;hb=968b74fa8e5d13308e6b1a58392d16d3469f2980;hpb=9fccad8f53ef43026a8632bfb6eabc32849a8c46

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 83bd831..4b64cf0 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2016-2018 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,131 +19,98 @@ package org.onap.aai.esr;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.dropwizard.Configuration;
 import org.hibernate.validator.constraints.NotEmpty;
-import org.jvnet.hk2.annotations.Service;
-
-
 import javax.validation.Valid;
 
-@Service
 public class ExtsysAppConfiguration extends Configuration {
-  @NotEmpty
-  private String template;
-
-  @NotEmpty
-  private String defaultName = "ONAP-A&AI-ESR";
-
-  @NotEmpty
-  private String msbDiscoveryIp;
-  
-  @NotEmpty
-  private String msbDiscoveryPort;
-  
-  @NotEmpty
-  private String registByHand;
-  
-  @NotEmpty
-  private String msbServerAddr;
-  
-  @NotEmpty
-  private String cloudInfrastructureAddr;
-  
-  @NotEmpty
-  private String externalSystemAddr;
-  
-  @Valid
-  private String serviceIp;
-  
-  @JsonProperty
-  public String getTemplate() {
-    return template;
-  }
-
-  @JsonProperty
-  public void setTemplate(String template) {
-    this.template = template;
-  }
-
-  @JsonProperty
-  public String getDefaultName() {
-    return defaultName;
-  }
-
-  @JsonProperty
-  public void setDefaultName(String name) {
-    this.defaultName = name;
-  }
-  
-  @JsonProperty
-  public String getMsbDiscoveryIp() {
-    return msbDiscoveryIp;
-  }
-  
-  @JsonProperty
-  public String setMsbDiscoveryIp() {
-    return msbDiscoveryIp;
-  }
-  
-  @JsonProperty
-  public String getMsbServerAddr() {
-    return msbServerAddr;
-  }
-
-  @JsonProperty
-  public void setMsbServerAddr(String msbServerAddr) {
-    this.msbServerAddr = msbServerAddr;
-  }
-  @JsonProperty
-  public String getServiceIp() {
-    return serviceIp;
-  }
-
-  @JsonProperty
-  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;
-  }
-
-  @JsonProperty
-  public String getCloudInfrastructureAddr() {
-    return cloudInfrastructureAddr;
-  }
-
-  @JsonProperty
-  public void setCloudInfrastructureAddr(String cloudInfrastructureAddr) {
-    this.cloudInfrastructureAddr = cloudInfrastructureAddr;
-  }
-
-  @JsonProperty
-  public String getExternalSystemAddr() {
-    return externalSystemAddr;
-  }
-
-  @JsonProperty
-  public void setExternalSystemAddr(String externalSystemAddr) {
-    this.externalSystemAddr = externalSystemAddr;
-  }
-
-  @JsonProperty
-  public void setMsbDiscoveryIp(String msbDiscoveryIp) {
-    this.msbDiscoveryIp = msbDiscoveryIp;
-  }
+    @NotEmpty
+    private String template;
+
+    @NotEmpty
+    private String defaultName = "ONAP-A&AI-ESR";
+
+    @NotEmpty
+    private String msbDiscoveryIp;
+
+    @NotEmpty
+    private String msbDiscoveryPort;
+
+    @NotEmpty
+    private String registByHand;
+
+    @NotEmpty
+    private String msbServerAddr;
+
+    @Valid
+    private String serviceIp;
+
+    @JsonProperty
+    public String getTemplate() {
+        return template;
+    }
+
+    @JsonProperty
+    public void setTemplate(String template) {
+        this.template = template;
+    }
+
+    @JsonProperty
+    public String getDefaultName() {
+        return defaultName;
+    }
+
+    @JsonProperty
+    public void setDefaultName(String name) {
+        this.defaultName = name;
+    }
+
+    @JsonProperty
+    public String getMsbDiscoveryIp() {
+        return msbDiscoveryIp;
+    }
+
+    @JsonProperty
+    public void setMsbDiscoveryIp(String discoveryIp) {
+        this.msbDiscoveryIp = discoveryIp;
+    }
+
+    @JsonProperty
+    public String getMsbServerAddr() {
+        return msbServerAddr;
+    }
+
+    @JsonProperty
+    public void setMsbServerAddr(String msbServerAddr) {
+        this.msbServerAddr = msbServerAddr;
+    }
+
+    @JsonProperty
+    public String getServiceIp() {
+        return serviceIp;
+    }
+
+    @JsonProperty
+    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;
+    }
+
 }