X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-core%2Fesr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fresource%2FVnfmManager.java;h=d01114e1eb55c7df31397d682e73e53b9d062e24;hb=ac489e7598190f1165ff6f7a5dee32e506386770;hp=7e2acb31ccf8f43e1f0af8e72a197bf306328a4e;hpb=04bbf4c42d323ffa6027e820f570d3c733299dea;p=aai%2Fesr-server.git

diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java
index 7e2acb3..d01114e 100644
--- a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java
+++ b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java
@@ -22,12 +22,13 @@ import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.eclipse.jetty.http.HttpStatus;
-import org.onap.aai.esr.entity.db.VnfmData;
+import org.onap.aai.esr.entity.aai.VnfmData;
 import org.onap.aai.esr.entity.rest.VnfmRestData;
 import org.onap.aai.esr.exception.ExtsysException;
 import org.onap.aai.esr.handle.VnfmHandler;
-import org.onap.aai.esr.util.ExtsysDbUtil;
+import org.onap.aai.esr.util.ExtsysUtil;
 import org.onap.aai.esr.util.RestResponseUtil;
+import org.onap.aai.esr.wrapper.VnfmManagerWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,25 +69,7 @@ public class VnfmManager {
   @Timed
   public Response queryVnfmList() {
     LOGGER.info("start query all vnfm!");
-    List<VnfmData> list;
-    try {
-      list = handler.getAll();
-    } catch (ExtsysException error) {
-      LOGGER.error("query all vnfm failed.errorMsg:" + error.getErrorMsg());
-      return RestResponseUtil.getErrorResponse(error);
-    }
-    if (list == null || list.size() <= 0) {
-      LOGGER.info("query all vnfm end.no match condition record");
-      return RestResponseUtil.getSuccessResponse(new ArrayList<VnfmRestData>());
-    } else {
-      LOGGER.info("query all vnfm end.size:" + list.size());
-      ArrayList<VnfmRestData> restList = new ArrayList<VnfmRestData>();
-      for (int i = 0; i < list.size(); i++) {
-        restList.add(new VnfmRestData(list.get(i)));
-      }
-      return RestResponseUtil.getSuccessResponse(restList);
-    }
-
+    return VnfmManagerWrapper.getInstance().queryVnfmList();
   }
   
   /**
@@ -106,20 +89,7 @@ public class VnfmManager {
   @Timed
   public Response queryVnfmById(@ApiParam(value = "vnfm id") @PathParam("vnfmId") String vnfmId) {
     LOGGER.info("start query  vnfm by id." + vnfmId);
-    List<VnfmData> list;
-    try {
-      list = handler.getVnfmById(vnfmId);
-    } catch (ExtsysException error) {
-      LOGGER.error("query  vnfm failed.errorMsg:" + error.getErrorMsg());
-      return RestResponseUtil.getErrorResponse(error);
-    }
-    if (list == null || list.size() <= 0) {
-      LOGGER.info("query  vnfm end.no match condition record");
-      return RestResponseUtil.getSuccessResponse(null);
-    } else {
-      LOGGER.info("query  vnfm end.info:" + ExtsysDbUtil.objectToString(list));
-      return RestResponseUtil.getSuccessResponse(new VnfmRestData(list.get(0)));
-    }
+    return VnfmManagerWrapper.getInstance().queryVnfmById(vnfmId);
   }
   
   /**
@@ -138,14 +108,7 @@ public class VnfmManager {
   @Timed
   public Response delVnfm(@ApiParam(value = "vnfm id") @PathParam("vnfmId") String vnfmId) {
     LOGGER.info("start delete vnfm .id:" + vnfmId);
-    try {
-      handler.delete(vnfmId);
-    } catch (ExtsysException error) {
-      LOGGER.error("delete vnfm failed.errorMsg:" + error.getErrorMsg());
-      return RestResponseUtil.getErrorResponse(error);
-    }
-    LOGGER.info(" delete vnfm end !");
-    return Response.noContent().build();
+    return VnfmManagerWrapper.getInstance().delVnfm(vnfmId);
   }
   
   /**
@@ -164,18 +127,10 @@ public class VnfmManager {
       @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
           response = String.class)})
   @Timed
-  public Response updateVnfms(@ApiParam(value = "vnfm", required = true) VnfmData vnfm,
+  public Response updateVnfm(@ApiParam(value = "vnfm", required = true) VnfmRestData vnfm,
       @ApiParam(value = "vnfm id", required = true) @PathParam("vnfmId") String vnfmId) {
-    LOGGER.info("start update vnfm .id:" + vnfmId + " info:" + ExtsysDbUtil.objectToString(vnfm));
-    VnfmData newData;
-    try {
-      newData = handler.update(vnfm, vnfmId);
-    } catch (ExtsysException error) {
-      LOGGER.error("update vnfm failed.errorMsg:" + error.getErrorMsg());
-      return RestResponseUtil.getErrorResponse(error);
-    }
-    LOGGER.info(" update vnfm end !");
-    return RestResponseUtil.getSuccessResponse(new VnfmRestData(newData));
+    LOGGER.info("start update vnfm .id:" + vnfmId + " info:" + ExtsysUtil.objectToString(vnfm));
+    return VnfmManagerWrapper.getInstance().updateVnfm(vnfm, vnfmId);
   }
   
   /**
@@ -194,16 +149,7 @@ public class VnfmManager {
       @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
           response = String.class)})
   @Timed
-  public Response addVnfms(@ApiParam(value = "vnfm", required = true) VnfmData vnfm) {
-    LOGGER.info("start add vnfm" + " info:" + ExtsysDbUtil.objectToString(vnfm));
-    VnfmData vnfmData;
-    try {
-      vnfmData = handler.add(vnfm);
-    } catch (ExtsysException error) {
-      LOGGER.error("add vnfm failed.errorMsg:" + error.getErrorMsg());
-      return RestResponseUtil.getErrorResponse(error);
-    }
-    LOGGER.info(" add vnfm end !");
-    return RestResponseUtil.getCreateSussceeResponse(new VnfmRestData(vnfmData));
+  public Response registerVnfm(@ApiParam(value = "vnfm", required = true) VnfmRestData vnfm) {
+    return VnfmManagerWrapper.getInstance().registerVnfm(vnfm);
   }
 }