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%2Fexternalservice%2Faai%2FExternalSystemProxy.java;h=bd8c77d2d7df99b6018cd8b7d4a9f9a5837f78e2;hp=6fca0e63205881fb6986271f05c7f421270659f7;hb=f316de26b8d0028cb1eed863039492c5d07e23c5;hpb=83c6e0c5f6214af24efc124ed6cf840e6ad59cc4

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java
index 6fca0e6..bd8c77d 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java
@@ -21,127 +21,124 @@ import org.onap.aai.esr.entity.aai.EsrEmsDetail;
 import org.onap.aai.esr.entity.aai.EsrThirdpartySdncDetail;
 import org.onap.aai.esr.entity.aai.EsrVnfmDetail;
 import org.onap.aai.esr.exception.ExtsysException;
-
 import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
 
 public class ExternalSystemProxy {
 
-  private static IExternalSystem externalSystemproxy;
-
-  private static String transactionId = "9999";
-  private static String fromAppId = "esr-server";
-  private static String authorization = AaiCommon.getAuthenticationCredentials();
-  static {
-    ClientConfig config = new ClientConfig();
-    externalSystemproxy = ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(),
-        config, IExternalSystem.class);
-  }
-
-  public static void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException {
-    ClientConfig config = new ClientConfig(new VnfmRegisterProvider());
-    IExternalSystem registerVnfmServiceproxy = ConsumerFactory
-        .createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
-    try {
-      registerVnfmServiceproxy.registerVNFM(transactionId, fromAppId, authorization, vnfmId,
-          esrVnfmDetail);
-    } catch (Exception e) {
-      throw new ExtsysException("PUT VNFM to A&AI failed.", e);
+    private static IExternalSystem externalSystem;
+    private static String transactionId = "9999";
+    private static String fromAppId = "esr-server";
+    private static String authorization = AaiCommon.getAuthenticationCredentials();
+    static {
+        ClientConfig config = new ClientConfig();
+        externalSystem =
+                ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
     }
-  }
-  
-  public static String queryVnfmDetail(String vnfmId) throws ExtsysException {
-    try {
-      return externalSystemproxy.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId);
-    } catch (Exception e) {
-      throw new ExtsysException("Query VNFM detail from A&AI failed.", e);
+    
+    public void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException {
+        ClientConfig config = new ClientConfig(new VnfmRegisterProvider());
+        IExternalSystem registerVnfmServiceproxy =
+                ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
+        try {
+            registerVnfmServiceproxy.registerVNFM(transactionId, fromAppId, authorization, vnfmId, esrVnfmDetail);
+        } catch (Exception e) {
+            throw new ExtsysException("PUT VNFM to A&AI failed.", e);
+        }
     }
-  }
-  
-  public static String queryVnfmList() throws ExtsysException {
-    try {
-      return externalSystemproxy.queryVNFMList(transactionId, fromAppId, authorization);
-    } catch (Exception e) {
-      throw new ExtsysException("Query VNFM list from A&AI failed.", e);
+
+    public String queryVnfmDetail(String vnfmId) throws ExtsysException {
+        try {
+            return externalSystem.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId);
+        } catch (Exception e) {
+            throw new ExtsysException("Query VNFM detail from A&AI failed.", e);
+        }
     }
-  }
-  
-  public static void deleteVnfm(String vnfmId, String resourceVersion) throws ExtsysException {
-    try {
-      externalSystemproxy.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion);
-    } catch (Exception e) {
-      throw new ExtsysException("Delete VNFM from A&AI failed.", e);
+
+    public String queryVnfmList() throws ExtsysException {
+        try {
+            return externalSystem.queryVNFMList(transactionId, fromAppId, authorization);
+        } catch (Exception e) {
+            throw new ExtsysException("Query VNFM list from A&AI failed.", e);
+        }
     }
-  }
-  
-  public static void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail) throws ExtsysException {
-    ClientConfig config = new ClientConfig(new ThirdpartySdncRegisterProvider());
-    IExternalSystem registerSdncServiceproxy = ConsumerFactory
-        .createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
-    try {
-      registerSdncServiceproxy.registerThirdpartySdnc(transactionId, fromAppId, authorization, thirdpartySdncId,
-          esrSdncDetail);
-    } catch (Exception e) {
-      throw new ExtsysException("PUT thirdparty SDNC to A&AI failed.", e);
+
+    public void deleteVnfm(String vnfmId, String resourceVersion) throws ExtsysException {
+        try {
+            externalSystem.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion);
+        } catch (Exception e) {
+            throw new ExtsysException("Delete VNFM from A&AI failed.", e);
+        }
     }
-  }
-  
-  public static String queryThirdpartySdncDetail(String thirdpartySdncId) throws ExtsysException {
-    try {
-      return externalSystemproxy.queryThirdpartySdncDetail(transactionId, fromAppId, authorization, thirdpartySdncId);
-    } catch (Exception e) {
-      throw new ExtsysException("Query thirdparty SDNC detail from A&AI failed.", e);
+
+    public void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail) throws ExtsysException {
+        ClientConfig config = new ClientConfig(new ThirdpartySdncRegisterProvider());
+        IExternalSystem registerSdncServiceproxy =
+                ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
+        try {
+            registerSdncServiceproxy.registerThirdpartySdnc(transactionId, fromAppId, authorization, thirdpartySdncId,
+                    esrSdncDetail);
+        } catch (Exception e) {
+            throw new ExtsysException("PUT thirdparty SDNC to A&AI failed.", e);
+        }
     }
-  }
-  
-  public static String querySdncList() throws ExtsysException {
-    try {
-      return externalSystemproxy.queryThirdpartySdncList(transactionId, fromAppId, authorization);
-    } catch (Exception e) {
-      throw new ExtsysException("Query thirdparty SDNC list from A&AI failed.", e);
+
+    public String queryThirdpartySdncDetail(String thirdpartySdncId) throws ExtsysException {
+        try {
+            return externalSystem.queryThirdpartySdncDetail(transactionId, fromAppId, authorization,
+                    thirdpartySdncId);
+        } catch (Exception e) {
+            throw new ExtsysException("Query thirdparty SDNC detail from A&AI failed.", e);
+        }
     }
-  }
-  
-  public static void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws ExtsysException {
-    try {
-      externalSystemproxy.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId, resourceVersion);
-    } catch (Exception e) {
-      throw new ExtsysException("Delete thirdparty SDNC from A&AI failed.", e);
+
+    public String querySdncList() throws ExtsysException {
+        try {
+            return externalSystem.queryThirdpartySdncList(transactionId, fromAppId, authorization);
+        } catch (Exception e) {
+            throw new ExtsysException("Query thirdparty SDNC list from A&AI failed.", e);
+        }
     }
-  }
-  
-  public static void registerEms(String emsId, EsrEmsDetail emsDetail) throws ExtsysException {
-    ClientConfig config = new ClientConfig(new EmsRegisterProvider());
-    IExternalSystem registerEmsServiceproxy = ConsumerFactory
-        .createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
-    try {
-      registerEmsServiceproxy.registerEMS(transactionId, fromAppId, authorization, emsId,
-          emsDetail);
-    } catch (Exception e) {
-      throw new ExtsysException("PUT EMS to A&AI failed.", e);
+
+    public void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws ExtsysException {
+        try {
+            externalSystem.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId, resourceVersion);
+        } catch (Exception e) {
+            throw new ExtsysException("Delete thirdparty SDNC from A&AI failed.", e);
+        }
     }
-  }
-  
-  public static String queryEmsDetail(String emsId) throws ExtsysException {
-    try {
-      return externalSystemproxy.queryEMSDetail(transactionId, fromAppId, authorization, emsId);
-    } catch (Exception e) {
-      throw new ExtsysException("Query EMS detail from A&AI failed.", e);
+
+    public void registerEms(String emsId, EsrEmsDetail emsDetail) throws ExtsysException {
+        ClientConfig config = new ClientConfig(new EmsRegisterProvider());
+        IExternalSystem registerEmsServiceproxy =
+                ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
+        try {
+            registerEmsServiceproxy.registerEMS(transactionId, fromAppId, authorization, emsId, emsDetail);
+        } catch (Exception e) {
+            throw new ExtsysException("PUT EMS to A&AI failed.", e);
+        }
     }
-  }
-  
-  public static String queryEmsList() throws ExtsysException {
-    try {
-      return externalSystemproxy.queryEMSList(transactionId, fromAppId, authorization);
-    } catch (Exception e) {
-      throw new ExtsysException("Query EMS list from A&AI failed.", e);
+
+    public String queryEmsDetail(String emsId) throws ExtsysException {
+        try {
+            return externalSystem.queryEMSDetail(transactionId, fromAppId, authorization, emsId);
+        } catch (Exception e) {
+            throw new ExtsysException("Query EMS detail from A&AI failed.", e);
+        }
     }
-  }
-  
-  public static void deleteEms(String emsId, String resourceVersion) throws ExtsysException {
-    try {
-      externalSystemproxy.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion);
-    } catch (Exception e) {
-      throw new ExtsysException("Delete EMS from A&AI failed.", e);
+
+    public String queryEmsList() throws ExtsysException {
+        try {
+            return externalSystem.queryEMSList(transactionId, fromAppId, authorization);
+        } catch (Exception e) {
+            throw new ExtsysException("Query EMS list from A&AI failed.", e);
+        }
+    }
+
+    public void deleteEms(String emsId, String resourceVersion) throws ExtsysException {
+        try {
+            externalSystem.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion);
+        } catch (Exception e) {
+            throw new ExtsysException("Delete EMS from A&AI failed.", e);
+        }
     }
-  }
 }