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%2Fwrapper%2FEmsManagerWrapper.java;h=588baad96c7942e83e0670784bbf423505c7b194;hp=6436bf82efa09acc439cf7c1d5416115196f2d70;hb=HEAD;hpb=07c89153d16b14bda54f16ef9f37e54bfc0a68f8

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 6436bf8..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
@@ -16,10 +16,11 @@
 package org.onap.aai.esr.wrapper;
 
 import java.util.ArrayList;
-
+import java.util.List;
 import javax.ws.rs.core.Response;
-
 import org.onap.aai.esr.entity.rest.EmsRegisterInfo;
+import org.onap.aai.esr.exception.ExceptionUtil;
+import org.onap.aai.esr.exception.ExtsysException;
 import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy;
 import org.onap.aai.esr.util.EmsManagerUtil;
 import org.onap.aai.esr.entity.aai.EsrEmsDetail;
@@ -28,172 +29,151 @@ import org.onap.aai.esr.entity.aai.EsrSystemInfo;
 import org.onap.aai.esr.entity.rest.CommonRegisterResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import com.google.gson.Gson;
 
 public class EmsManagerWrapper {
-  private static EmsManagerWrapper emsManagerWrapper;
-  private static final Logger LOG = LoggerFactory.getLogger(EmsManagerWrapper.class);
-  private static EmsManagerUtil emsManagerUtil = new EmsManagerUtil();
-
-  /**
-   * get VnfmManagerWrapper instance.
-   * @return ems manager wrapper instance
-   */
-  public static EmsManagerWrapper getInstance() {
-    if (emsManagerWrapper == null) {
-      emsManagerWrapper = new 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.
+     * 
+     * @return ems manager wrapper instance
+     */
+    public static EmsManagerWrapper getInstance() {
+        if (emsManagerWrapper == null) {
+            emsManagerWrapper = new EmsManagerWrapper(externalSystemProxy);
+        }
+        return emsManagerWrapper;
+    }
+    
+    public EmsManagerWrapper(ExternalSystemProxy externalSystemProxy){
+        EmsManagerWrapper.externalSystemProxy = externalSystemProxy;
     }
-    return emsManagerWrapper;
-  }
-  
-  public Response registerEms(EmsRegisterInfo emsRegisterInfo) {
-    CommonRegisterResponse result = new CommonRegisterResponse();
-    EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
-    esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
-    String emsId = esrEmsDetail.getEmsId();
-    try {
-      ExternalSystemProxy.registerEms(emsId, esrEmsDetail);
-      result.setId(emsId);
-      return Response.ok(result).build();
-    } catch (Exception e) {
-      e.printStackTrace();
-      LOG.error("Register EMS failed !" + e.getMessage());
-      return Response.serverError().build();
+
+    public Response registerEms(EmsRegisterInfo emsRegisterInfo) {
+        CommonRegisterResponse result = new CommonRegisterResponse();
+        EsrEmsDetail esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
+        String emsId = esrEmsDetail.getEmsId();
+        try {
+            externalSystemProxy.registerEms(emsId, esrEmsDetail);
+            result.setId(emsId);
+            return Response.ok(result).build();
+        } catch (ExtsysException e) {
+            LOG.error("Register EMS failed !", e);
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+        }
     }
-  }
 
-  public Response updateEms(EmsRegisterInfo emsRegisterInfo, String emsId) {
-    CommonRegisterResponse result = new CommonRegisterResponse();
-    EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
-    esrEmsDetail = getNewEsrEmsDetail(emsRegisterInfo, emsId);
-    try {
-      ExternalSystemProxy.registerEms(emsId, esrEmsDetail);
-      result.setId(emsId);
-      return Response.ok(result).build();
-    } catch (Exception e) {
-      e.printStackTrace();
-      LOG.error("Update VNFM failed !" + e.getMessage());
-      return Response.serverError().build();
+    public Response updateEms(EmsRegisterInfo emsRegisterInfo, String emsId) {
+        CommonRegisterResponse result = new CommonRegisterResponse();
+        EsrEmsDetail esrEmsDetail = getNewEsrEmsDetail(emsRegisterInfo, emsId);
+        try {
+            externalSystemProxy.registerEms(emsId, esrEmsDetail);
+            result.setId(emsId);
+            return Response.ok(result).build();
+        } catch (ExtsysException e) {
+            LOG.error("Update VNFM failed !", e);
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+        }
     }
-  }
-  
-  public Response queryEmsList() {
-    ArrayList<EmsRegisterInfo> emsList = new ArrayList<EmsRegisterInfo>();
-    EsrEmsList esrEms = new EsrEmsList();
-    try {
-      String esrEmsStr = ExternalSystemProxy.queryEmsList();
-      esrEms = new Gson().fromJson(esrEmsStr, EsrEmsList.class);
-      LOG.info("Response from AAI by query EMS list: " + esrEms);
-      emsList = getEmsDetailList(esrEms);
-      return Response.ok(emsList).build();
-    } catch (Exception e) {
-      e.printStackTrace();
-      LOG.error("Query EMS list failed !");
-      return Response.ok(emsList).build();
+
+    public Response queryEmsList() {
+        List<EmsRegisterInfo> emsList = new ArrayList<>();
+        EsrEmsList esrEms = new EsrEmsList();
+        try {
+            String esrEmsStr = externalSystemProxy.queryEmsList();
+            esrEms = new Gson().fromJson(esrEmsStr, EsrEmsList.class);
+            LOG.info("Response from AAI by query EMS list: " + esrEms);
+            emsList = getEmsDetailList(esrEms);
+            return Response.ok(emsList).build();
+        } catch (ExtsysException e) {
+            LOG.error("Query EMS list failed !", e);
+            return Response.ok(emsList).build();
+        }
     }
-  }
-  
-  public Response queryEmsById(String emsId) {
-    EmsRegisterInfo ems = new EmsRegisterInfo();
-    ems = queryEmsDetail(emsId);
-    if (ems != null) {
-      return Response.ok(ems).build();
-    } else {
-      return Response.ok(ems).build();
+
+    public Response queryEmsById(String emsId) {
+        EmsRegisterInfo ems = queryEmsDetail(emsId);
+        if (ems != null) {
+            return Response.ok(ems).build();
+        } else {
+            return Response.ok(ems).build();
+        }
     }
-  }
-  
-  public Response delEms(String emsId) {
-    EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
-    esrEmsDetail = queryEsrEmsDetail(emsId);
-    String resourceVersion = esrEmsDetail.getResourceVersion();
-    if (resourceVersion != null) {
-      try {
-        ExternalSystemProxy.deleteEms(emsId, resourceVersion);
-        return Response.noContent().build();
-      } catch (Exception e) {
-        e.printStackTrace();
-        LOG.error("Delete EMS from A&AI failed! EMS ID: " + emsId + "resouce-version:"
-            + resourceVersion, e.getMessage());
-        return Response.serverError().build();
-      }
-    } else {
-      LOG.error("resouce-version is null ! Can not delete resouce from A&AI. ");
-      return Response.serverError().build();
+
+    public Response delEms(String emsId) {
+        EsrEmsDetail esrEmsDetail = queryEsrEmsDetail(emsId);
+        String resourceVersion = esrEmsDetail.getResourceVersion();
+        try {
+            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);
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+        }
     }
-  }
-  
-  private EmsRegisterInfo queryEmsDetail(String emsId) {
-    EmsRegisterInfo emsRegisterInfo = new EmsRegisterInfo();
-    EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
-    try {
-      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);
-      return emsRegisterInfo;
-    } catch (Exception e) {
-      e.printStackTrace();
-      LOG.error("Query EMS detail failed! EMS ID: " + emsId, e.getMessage());
-      return null;
+
+    private EmsRegisterInfo queryEmsDetail(String emsId) {
+        EmsRegisterInfo emsRegisterInfo = new EmsRegisterInfo();
+        EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
+        try {
+            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);
+        } catch (ExtsysException e) {
+            LOG.error("Query EMS detail failed! EMS ID: " + emsId, e);
+        }
+        return emsRegisterInfo;
     }
-  }
-  
-  private ArrayList<EmsRegisterInfo> getEmsDetailList(EsrEmsList esrEms) {
-    ArrayList<EmsRegisterInfo> emsInfoList = new ArrayList<EmsRegisterInfo>();
-    EmsRegisterInfo emsInfo = new EmsRegisterInfo();
-    for (int i = 0; i < esrEms.getEsrEms().size(); i++) {
-      String emsId = esrEms.getEsrEms().get(i).getEmsId();
-      emsInfo = queryEmsDetail(emsId);
-      if (emsInfo != null) {
-        emsInfoList.add(emsInfo);
-      }
+
+    private List<EmsRegisterInfo> getEmsDetailList(EsrEmsList esrEms) {
+        List<EmsRegisterInfo> emsInfoList = new ArrayList<>();
+        for (int i = 0; i < esrEms.getEsrEms().size(); i++) {
+            String emsId = esrEms.getEsrEms().get(i).getEmsId();
+            EmsRegisterInfo emsInfo = queryEmsDetail(emsId);
+            if (emsInfo != null) {
+                emsInfoList.add(emsInfo);
+            }
+        }
+        return emsInfoList;
     }
-    return emsInfoList;
-  }
-  
-  private EsrEmsDetail queryEsrEmsDetail (String emsId) {
-    EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
-    try {
-      String esrEmsStr = ExternalSystemProxy.queryEmsDetail(emsId);
-      LOG.info("Response from AAI by query EMS: " + esrEmsStr);
-      esrEmsDetail = new Gson().fromJson(esrEmsStr, EsrEmsDetail.class);
-    } catch (Exception e) {
-      e.printStackTrace();
-      LOG.error("Query EMS detail failed! EMS ID: " + emsId, e.getMessage());
+
+    private EsrEmsDetail queryEsrEmsDetail(String emsId) {
+        EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
+        try {
+            String esrEmsStr = externalSystemProxy.queryEmsDetail(emsId);
+            LOG.info("Response from AAI by query EMS: " + esrEmsStr);
+            esrEmsDetail = new Gson().fromJson(esrEmsStr, EsrEmsDetail.class);
+        } catch (ExtsysException e) {
+            LOG.error("Query EMS detail failed! EMS ID: " + emsId, e);
+        }
+        return esrEmsDetail;
     }
-    return esrEmsDetail;
-  }
-  
-  private EsrEmsDetail getNewEsrEmsDetail(EmsRegisterInfo emsRegisterInfo, String emsId) {
-    EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
-    ArrayList<EsrSystemInfo> newEsrSysInfoList = new ArrayList<EsrSystemInfo>();
-    EsrSystemInfo newEsrSystemInfo = new EsrSystemInfo();
-    EsrEmsDetail oriEsrEmsDetail = new EsrEmsDetail();
-    ArrayList<EsrSystemInfo> oriEsrSysInfoList = new ArrayList<EsrSystemInfo>();
-    EsrSystemInfo originalEsrSystemInfo = new EsrSystemInfo();
-    
-    oriEsrEmsDetail = queryEsrEmsDetail(emsId);
-    esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
-    String emsResourceVersion = oriEsrEmsDetail.getResourceVersion();
-    esrEmsDetail.setResourceVersion(emsResourceVersion);
-    esrEmsDetail.setEmsId(emsId);
-    newEsrSysInfoList = esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo();
-    oriEsrSysInfoList = oriEsrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo();
-    for (int i = 0; i < oriEsrSysInfoList.size(); i++) {
-      originalEsrSystemInfo = oriEsrSysInfoList.get(i);
-      for (int j = 0; j < newEsrSysInfoList.size(); j++) {
-        newEsrSystemInfo = newEsrSysInfoList.get(j);
-        if (originalEsrSystemInfo.getSystemType().equals(newEsrSystemInfo.getSystemType())) {
-          esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo().get(j)
-              .setResouceVersion(originalEsrSystemInfo.getResouceVersion());
-          esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo().get(j)
-              .setEsrSystemInfoId(originalEsrSystemInfo.getEsrSystemInfoId());
-          break;
+
+    private EsrEmsDetail getNewEsrEmsDetail(EmsRegisterInfo emsRegisterInfo, String emsId) {
+        EsrEmsDetail oriEsrEmsDetail = queryEsrEmsDetail(emsId);
+        EsrEmsDetail esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
+        String emsResourceVersion = oriEsrEmsDetail.getResourceVersion();
+        esrEmsDetail.setResourceVersion(emsResourceVersion);
+        esrEmsDetail.setEmsId(emsId);
+        List<EsrSystemInfo> newEsrSysInfoList = esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo();
+        List<EsrSystemInfo> oriEsrSysInfoList = oriEsrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo();
+        for (int i = 0; i < oriEsrSysInfoList.size(); i++) {
+            EsrSystemInfo originalEsrSystemInfo = oriEsrSysInfoList.get(i);
+            for (int j = 0; j < newEsrSysInfoList.size(); j++) {
+                EsrSystemInfo newEsrSystemInfo = newEsrSysInfoList.get(j);
+                if (originalEsrSystemInfo.getSystemType().equals(newEsrSystemInfo.getSystemType())) {
+                    esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo().get(j)
+                            .setResouceVersion(originalEsrSystemInfo.getResouceVersion());
+                    esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo().get(j)
+                            .setEsrSystemInfoId(originalEsrSystemInfo.getEsrSystemInfoId());
+                    break;
+                }
+            }
         }
-      }
+        return esrEmsDetail;
     }
-    return esrEmsDetail;
-  }
 }