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=f7e70975043e72a55fd4b4f27c015923efb940af;hb=1d3d273283587b17768437ece873617254e52d51;hp=072da50011a609ae4602f5176e5c3a52e0fad771;hpb=1426d317100619a8c655f66ef234a3b669187f26;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 072da50..f7e7097 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
@@ -25,9 +25,9 @@ import org.eclipse.jetty.http.HttpStatus;
 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;
 
@@ -48,7 +48,6 @@ import javax.ws.rs.core.Response;
 @Api(tags = {" vnfm Management "})
 public class VnfmManager {
 
-  VnfmHandler handler = new VnfmHandler();
   private static final Logger LOGGER = LoggerFactory.getLogger(VnfmManager.class);
 
   /**
@@ -68,26 +67,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)));
-        restList.add(new VnfmRestData());
-      }
-      return RestResponseUtil.getSuccessResponse(restList);
-    }
-
+    return VnfmManagerWrapper.getInstance().queryVnfmList();
   }
   
   /**
@@ -107,21 +87,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 RestResponseUtil.getSuccessResponse(new VnfmRestData());
-    }
+    return VnfmManagerWrapper.getInstance().queryVnfmById(vnfmId);
   }
   
   /**
@@ -140,14 +106,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);
   }
   
   /**
@@ -166,19 +125,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));
-    return RestResponseUtil.getSuccessResponse(new VnfmRestData());
+    LOGGER.info("start update vnfm .id:" + vnfmId + " info:" + ExtsysUtil.objectToString(vnfm));
+    return VnfmManagerWrapper.getInstance().updateVnfm(vnfm, vnfmId);
   }
   
   /**
@@ -197,17 +147,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));
-    return RestResponseUtil.getCreateSussceeResponse(new VnfmRestData());
+  public Response registerVnfm(@ApiParam(value = "vnfm", required = true) VnfmRestData vnfm) {
+    return VnfmManagerWrapper.getInstance().registerVnfm(vnfm);
   }
 }