Fix the return data of delete and query API.

[aai/esr-server.git] / esr-mgr / src / main / java / org / onap / aai / esr / wrapper / EmsManagerWrapper.java

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..07e510e 100644 (file)
--- 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
@@ -34,6 +34,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,7 +50,7 @@ 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);
@@ -89,7 +90,7 @@ public class EmsManagerWrapper {
     } catch (Exception e) {
       e.printStackTrace();
       LOG.error("Query EMS list failed !");
-      return Response.serverError().build();
+      return Response.ok().build();
     }
   }
   
@@ -119,7 +120,7 @@ public class EmsManagerWrapper {
       }
     } else {
       LOG.error("resouce-version is null ! Can not delete resouce from A&AI. ");
-      return Response.serverError().build();
+      return Response.noContent().build();
     }
   }
   
@@ -130,7 +131,7 @@ 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);
+      emsRegisterInfo = emsManagerUtil.EsrEms2EmsRegisterInfo(esrEmsDetail);
       return emsRegisterInfo;
     } catch (Exception e) {
       e.printStackTrace();
@@ -174,7 +175,7 @@ public class EmsManagerWrapper {
     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);