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=8acc8257d265c518814e56ff6b21638f04397d1a;hp=36f79638aff312f2b95784e232063482de8b3d8c;hb=769718b3e8b4e659299602701b575cf1b4b182c5;hpb=48df9cda482edd36130777549ac42ee88f048af3

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 36f7963..8acc825 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,13 @@
 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;
@@ -34,6 +37,7 @@ 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.
@@ -49,16 +53,15 @@ public class EmsManagerWrapper {
   public Response registerEms(EmsRegisterInfo emsRegisterInfo) {
     CommonRegisterResponse result = new CommonRegisterResponse();
     EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
-    esrEmsDetail = EmsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
+    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();
+    } catch (ExtsysException e) {
+      LOG.error("Register EMS failed !", e);
+      throw ExceptionUtil.buildExceptionResponse(e.getMessage());
     }
   }
 
@@ -70,15 +73,14 @@ public class EmsManagerWrapper {
       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();
+    } catch (ExtsysException e) {
+      LOG.error("Update VNFM failed !", e);
+      throw ExceptionUtil.buildExceptionResponse(e.getMessage());
     }
   }
   
   public Response queryEmsList() {
-    ArrayList<EmsRegisterInfo> emsList = new ArrayList<EmsRegisterInfo>();
+    List<EmsRegisterInfo> emsList = new ArrayList<>();
     EsrEmsList esrEms = new EsrEmsList();
     try {
       String esrEmsStr = ExternalSystemProxy.queryEmsList();
@@ -86,20 +88,19 @@ public class EmsManagerWrapper {
       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.serverError().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();
+    EmsRegisterInfo ems;
     ems = queryEmsDetail(emsId);
     if (ems != null) {
       return Response.ok(ems).build();
     } else {
-      return Response.ok().build();
+      return Response.ok(ems).build();
     }
   }
   
@@ -107,22 +108,17 @@ public class EmsManagerWrapper {
     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();
+    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();
@@ -130,17 +126,15 @@ public class EmsManagerWrapper {
       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;
+      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>();
+  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();
@@ -158,23 +152,22 @@ public class EmsManagerWrapper {
       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());
+    } catch (ExtsysException e) {
+      LOG.error("Query EMS detail failed! EMS ID: " + emsId, e);
     }
     return esrEmsDetail;
   }
   
   private EsrEmsDetail getNewEsrEmsDetail(EmsRegisterInfo emsRegisterInfo, String emsId) {
     EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
-    ArrayList<EsrSystemInfo> newEsrSysInfoList = new ArrayList<EsrSystemInfo>();
+    List<EsrSystemInfo> newEsrSysInfoList = new ArrayList<>();
     EsrSystemInfo newEsrSystemInfo = new EsrSystemInfo();
     EsrEmsDetail oriEsrEmsDetail = new EsrEmsDetail();
-    ArrayList<EsrSystemInfo> oriEsrSysInfoList = new ArrayList<EsrSystemInfo>();
+    List<EsrSystemInfo> oriEsrSysInfoList = new ArrayList<>();
     EsrSystemInfo originalEsrSystemInfo = new EsrSystemInfo();
     
     oriEsrEmsDetail = queryEsrEmsDetail(emsId);
-    esrEmsDetail = EmsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
+    esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
     String emsResourceVersion = oriEsrEmsDetail.getResourceVersion();
     esrEmsDetail.setResourceVersion(emsResourceVersion);
     esrEmsDetail.setEmsId(emsId);