X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fwrapper%2FEmsManagerWrapper.java;h=588baad96c7942e83e0670784bbf423505c7b194;hb=d5eb2430bf0013b8be832eb02813c3844c0cef91;hp=fb8533379db48ec5b006766ef67a7f588449781c;hpb=486ed42762fedbc7cd0cc43704389ed41434eacd;p=aai%2Fesr-server.git

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
index fb85333..588baad 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
@@ -35,7 +35,7 @@ public class EmsManagerWrapper {
     private static EmsManagerWrapper emsManagerWrapper;
     private static final Logger LOG = LoggerFactory.getLogger(EmsManagerWrapper.class);
     private static EmsManagerUtil emsManagerUtil = new EmsManagerUtil();
-
+    private static ExternalSystemProxy externalSystemProxy = new ExternalSystemProxy();
     /**
      * get VnfmManagerWrapper instance.
      * 
@@ -43,18 +43,21 @@ public class EmsManagerWrapper {
      */
     public static EmsManagerWrapper getInstance() {
         if (emsManagerWrapper == null) {
-            emsManagerWrapper = new EmsManagerWrapper();
+            emsManagerWrapper = new EmsManagerWrapper(externalSystemProxy);
         }
         return emsManagerWrapper;
     }
+    
+    public EmsManagerWrapper(ExternalSystemProxy externalSystemProxy){
+        EmsManagerWrapper.externalSystemProxy = externalSystemProxy;
+    }
 
     public Response registerEms(EmsRegisterInfo emsRegisterInfo) {
         CommonRegisterResponse result = new CommonRegisterResponse();
-        EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
-        esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
+        EsrEmsDetail esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
         String emsId = esrEmsDetail.getEmsId();
         try {
-            ExternalSystemProxy.registerEms(emsId, esrEmsDetail);
+            externalSystemProxy.registerEms(emsId, esrEmsDetail);
             result.setId(emsId);
             return Response.ok(result).build();
         } catch (ExtsysException e) {
@@ -65,10 +68,9 @@ public class EmsManagerWrapper {
 
     public Response updateEms(EmsRegisterInfo emsRegisterInfo, String emsId) {
         CommonRegisterResponse result = new CommonRegisterResponse();
-        EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
-        esrEmsDetail = getNewEsrEmsDetail(emsRegisterInfo, emsId);
+        EsrEmsDetail esrEmsDetail = getNewEsrEmsDetail(emsRegisterInfo, emsId);
         try {
-            ExternalSystemProxy.registerEms(emsId, esrEmsDetail);
+            externalSystemProxy.registerEms(emsId, esrEmsDetail);
             result.setId(emsId);
             return Response.ok(result).build();
         } catch (ExtsysException e) {
@@ -81,7 +83,7 @@ public class EmsManagerWrapper {
         List<EmsRegisterInfo> emsList = new ArrayList<>();
         EsrEmsList esrEms = new EsrEmsList();
         try {
-            String esrEmsStr = ExternalSystemProxy.queryEmsList();
+            String esrEmsStr = externalSystemProxy.queryEmsList();
             esrEms = new Gson().fromJson(esrEmsStr, EsrEmsList.class);
             LOG.info("Response from AAI by query EMS list: " + esrEms);
             emsList = getEmsDetailList(esrEms);
@@ -102,11 +104,10 @@ public class EmsManagerWrapper {
     }
 
     public Response delEms(String emsId) {
-        EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
-        esrEmsDetail = queryEsrEmsDetail(emsId);
+        EsrEmsDetail esrEmsDetail = queryEsrEmsDetail(emsId);
         String resourceVersion = esrEmsDetail.getResourceVersion();
         try {
-            ExternalSystemProxy.deleteEms(emsId, resourceVersion);
+            externalSystemProxy.deleteEms(emsId, resourceVersion);
             return Response.noContent().build();
         } catch (ExtsysException e) {
             LOG.error("Delete EMS from A&AI failed! EMS ID: " + emsId + "resouce-version:" + resourceVersion, e);
@@ -118,7 +119,7 @@ public class EmsManagerWrapper {
         EmsRegisterInfo emsRegisterInfo = new EmsRegisterInfo();
         EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
         try {
-            String esrEmsStr = ExternalSystemProxy.queryEmsDetail(emsId);
+            String esrEmsStr = externalSystemProxy.queryEmsDetail(emsId);
             LOG.info("Response from AAI by query EMS: " + esrEmsStr);
             esrEmsDetail = new Gson().fromJson(esrEmsStr, EsrEmsDetail.class);
             emsRegisterInfo = emsManagerUtil.EsrEms2EmsRegisterInfo(esrEmsDetail);
@@ -130,10 +131,9 @@ public class EmsManagerWrapper {
 
     private List<EmsRegisterInfo> getEmsDetailList(EsrEmsList esrEms) {
         List<EmsRegisterInfo> emsInfoList = new ArrayList<>();
-        EmsRegisterInfo emsInfo = new EmsRegisterInfo();
         for (int i = 0; i < esrEms.getEsrEms().size(); i++) {
             String emsId = esrEms.getEsrEms().get(i).getEmsId();
-            emsInfo = queryEmsDetail(emsId);
+            EmsRegisterInfo emsInfo = queryEmsDetail(emsId);
             if (emsInfo != null) {
                 emsInfoList.add(emsInfo);
             }
@@ -144,7 +144,7 @@ public class EmsManagerWrapper {
     private EsrEmsDetail queryEsrEmsDetail(String emsId) {
         EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
         try {
-            String esrEmsStr = ExternalSystemProxy.queryEmsDetail(emsId);
+            String esrEmsStr = externalSystemProxy.queryEmsDetail(emsId);
             LOG.info("Response from AAI by query EMS: " + esrEmsStr);
             esrEmsDetail = new Gson().fromJson(esrEmsStr, EsrEmsDetail.class);
         } catch (ExtsysException e) {
@@ -154,24 +154,17 @@ public class EmsManagerWrapper {
     }
 
     private EsrEmsDetail getNewEsrEmsDetail(EmsRegisterInfo emsRegisterInfo, String emsId) {
-        EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
-        List<EsrSystemInfo> newEsrSysInfoList = new ArrayList<>();
-        EsrSystemInfo newEsrSystemInfo = new EsrSystemInfo();
-        EsrEmsDetail oriEsrEmsDetail = new EsrEmsDetail();
-        List<EsrSystemInfo> oriEsrSysInfoList = new ArrayList<>();
-        EsrSystemInfo originalEsrSystemInfo = new EsrSystemInfo();
-
-        oriEsrEmsDetail = queryEsrEmsDetail(emsId);
-        esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
+        EsrEmsDetail oriEsrEmsDetail = queryEsrEmsDetail(emsId);
+        EsrEmsDetail esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
         String emsResourceVersion = oriEsrEmsDetail.getResourceVersion();
         esrEmsDetail.setResourceVersion(emsResourceVersion);
         esrEmsDetail.setEmsId(emsId);
-        newEsrSysInfoList = esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo();
-        oriEsrSysInfoList = oriEsrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo();
+        List<EsrSystemInfo> newEsrSysInfoList = esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo();
+        List<EsrSystemInfo> oriEsrSysInfoList = oriEsrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo();
         for (int i = 0; i < oriEsrSysInfoList.size(); i++) {
-            originalEsrSystemInfo = oriEsrSysInfoList.get(i);
+            EsrSystemInfo originalEsrSystemInfo = oriEsrSysInfoList.get(i);
             for (int j = 0; j < newEsrSysInfoList.size(); j++) {
-                newEsrSystemInfo = newEsrSysInfoList.get(j);
+                EsrSystemInfo newEsrSystemInfo = newEsrSysInfoList.get(j);
                 if (originalEsrSystemInfo.getSystemType().equals(newEsrSystemInfo.getSystemType())) {
                     esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo().get(j)
                             .setResouceVersion(originalEsrSystemInfo.getResouceVersion());