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%2FVnfmManagerWrapper.java;h=8c7c5d39ceadff5e17f9c6d26d5540be49ada070;hp=65c26c37a13b3b8d30dfc52e077d8c3c4b1c9368;hb=a9c5b27687df9f1d72c58fa64899b6783f6aef5a;hpb=07c89153d16b14bda54f16ef9f37e54bfc0a68f8

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java
index 65c26c3..8c7c5d3 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java
@@ -16,174 +16,160 @@
 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.aai.EsrSystemInfo;
 import org.onap.aai.esr.entity.aai.EsrVnfmDetail;
 import org.onap.aai.esr.entity.aai.EsrVnfmList;
 import org.onap.aai.esr.entity.rest.CommonRegisterResponse;
 import org.onap.aai.esr.entity.rest.VnfmRegisterInfo;
+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.VnfmManagerUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import com.google.gson.Gson;
 
 public class VnfmManagerWrapper {
-  private static VnfmManagerWrapper vnfmManagerWrapper;
-  private static final Logger LOG = LoggerFactory.getLogger(VnfmManagerWrapper.class);
+    private static VnfmManagerWrapper vnfmManagerWrapper;
+    private static final Logger LOG = LoggerFactory.getLogger(VnfmManagerWrapper.class);
+
+    private static VnfmManagerUtil vnfmManagerUtil = new VnfmManagerUtil();
+    private static ExternalSystemProxy externalSystemProxy = new ExternalSystemProxy();
 
-  private static VnfmManagerUtil vnfmManagerUtil = new VnfmManagerUtil();
-  
-  /**
-   * get VnfmManagerWrapper instance.
-   * 
-   * @return vnfm manager wrapper instance
-   */
-  public static VnfmManagerWrapper getInstance() {
-    if (vnfmManagerWrapper == null) {
-      vnfmManagerWrapper = new VnfmManagerWrapper();
+    /**
+     * get VnfmManagerWrapper instance.
+     * 
+     * @return vnfm manager wrapper instance
+     */
+    public static VnfmManagerWrapper getInstance() {
+        if (vnfmManagerWrapper == null) {
+            vnfmManagerWrapper = new VnfmManagerWrapper(externalSystemProxy);
+        }
+        return vnfmManagerWrapper;
+    }
+    
+    public VnfmManagerWrapper(ExternalSystemProxy externalSystemProxy){
+        VnfmManagerWrapper.externalSystemProxy = externalSystemProxy;
     }
-    return vnfmManagerWrapper;
-  }
 
-  public Response registerVnfm(VnfmRegisterInfo vnfm) {
-    CommonRegisterResponse result = new CommonRegisterResponse();
-    EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
-    esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
-    String vnfmId = esrVnfmDetail.getVnfmId();
-    try {
-      ExternalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail);
-      result.setId(vnfmId);
-      return Response.ok(result).build();
-    } catch (Exception e) {
-      e.printStackTrace();
-      LOG.error("Register VNFM failed !" + e.getMessage());
-      return Response.serverError().build();
+    public Response registerVnfm(VnfmRegisterInfo vnfm) {
+        CommonRegisterResponse result = new CommonRegisterResponse();
+        EsrVnfmDetail esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
+        String vnfmId = esrVnfmDetail.getVnfmId();
+        try {
+            externalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail);
+            result.setId(vnfmId);
+            return Response.ok(result).build();
+        } catch (ExtsysException e) {
+            LOG.error("Register VNFM failed !", e);
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+        }
     }
-  }
 
-  public Response updateVnfm(VnfmRegisterInfo vnfm, String vnfmId) {
-    CommonRegisterResponse result = new CommonRegisterResponse();
-    EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
-    EsrVnfmDetail originalEsrVnfmDetail = new EsrVnfmDetail();
-    EsrSystemInfo originalEsrSystemInfo = new EsrSystemInfo();
-    originalEsrVnfmDetail = queryEsrVnfmDetail(vnfmId);
-    esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
-    String resourceVersion = getResourceVersion(vnfmId);
-    esrVnfmDetail.setResourceVersion(resourceVersion);
-    esrVnfmDetail.setVnfmId(vnfmId);
-    originalEsrSystemInfo = originalEsrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);
-    esrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
-        .setEsrSystemInfoId(originalEsrSystemInfo.getEsrSystemInfoId());
-    esrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
-        .setResouceVersion(originalEsrSystemInfo.getResouceVersion());
-    try {
-      ExternalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail);
-      result.setId(vnfmId);
-      return Response.ok(result).build();
-    } catch (Exception e) {
-      e.printStackTrace();
-      LOG.error("Update VNFM failed !" + e.getMessage());
-      return Response.serverError().build();
+    public Response updateVnfm(VnfmRegisterInfo vnfm, String vnfmId) {
+        CommonRegisterResponse result = new CommonRegisterResponse();
+        EsrVnfmDetail originalEsrVnfmDetail = queryEsrVnfmDetail(vnfmId);
+        EsrVnfmDetail esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
+        String resourceVersion = getResourceVersion(vnfmId);
+        esrVnfmDetail.setResourceVersion(resourceVersion);
+        esrVnfmDetail.setVnfmId(vnfmId);
+        EsrSystemInfo originalEsrSystemInfo = originalEsrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);
+        esrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
+                .setEsrSystemInfoId(originalEsrSystemInfo.getEsrSystemInfoId());
+        esrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
+                .setResouceVersion(originalEsrSystemInfo.getResouceVersion());
+        try {
+            externalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail);
+            result.setId(vnfmId);
+            return Response.ok(result).build();
+        } catch (ExtsysException e) {
+            LOG.error("Update VNFM failed !", e);
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+        }
     }
-  }
 
-  public Response queryVnfmList() {
-    ArrayList<VnfmRegisterInfo> vnfmList = new ArrayList<VnfmRegisterInfo>();
-    EsrVnfmList esrVnfm = new EsrVnfmList();
-    try {
-      String esrVnfmStr = ExternalSystemProxy.queryVnfmList();
-      esrVnfm = new Gson().fromJson(esrVnfmStr, EsrVnfmList.class);
-      LOG.info("Response from AAI by query VNFM list: " + esrVnfm);
-      vnfmList = getVnfmDetailList(esrVnfm);
-      return Response.ok(vnfmList).build();
-    } catch (Exception e) {
-      e.printStackTrace();
-      LOG.error("Query VNFM list failed !");
-      return Response.ok(vnfmList).build();
+    public Response queryVnfmList() {
+        List<VnfmRegisterInfo> vnfmList = new ArrayList<>();
+        EsrVnfmList esrVnfm = new EsrVnfmList();
+        try {
+            String esrVnfmStr = externalSystemProxy.queryVnfmList();
+            esrVnfm = new Gson().fromJson(esrVnfmStr, EsrVnfmList.class);
+            LOG.info("Response from AAI by query VNFM list: " + esrVnfm);
+            vnfmList = getVnfmDetailList(esrVnfm);
+            return Response.ok(vnfmList).build();
+        } catch (ExtsysException e) {
+            LOG.error("Query VNFM list failed !", e);
+            return Response.ok(vnfmList).build();
+        }
     }
-  }
 
-  public Response queryVnfmById(String vnfmId) {
-    VnfmRegisterInfo vnfm = new VnfmRegisterInfo();
-    vnfm = queryVnfmDetail(vnfmId);
-    if (vnfm != null) {
-      return Response.ok(vnfm).build();
-    } else {
-      return Response.ok(vnfm).build();
+    public Response queryVnfmById(String vnfmId) {
+        VnfmRegisterInfo vnfm = queryVnfmDetail(vnfmId);
+        if (vnfm != null) {
+            return Response.ok(vnfm).build();
+        } else {
+            return Response.ok(vnfm).build();
+        }
     }
-  }
 
-  public Response delVnfm(String vnfmId) {
-    String resourceVersion = getResourceVersion(vnfmId);
-    if (resourceVersion != null) {
-      try {
-        ExternalSystemProxy.deleteVnfm(vnfmId, resourceVersion);
-        return Response.noContent().build();
-      } catch (Exception e) {
-        e.printStackTrace();
-        LOG.error("Delete VNFM from A&AI failed! VNFM ID: " + vnfmId + "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 delVnfm(String vnfmId) {
+        String resourceVersion = getResourceVersion(vnfmId);
+        try {
+            externalSystemProxy.deleteVnfm(vnfmId, resourceVersion);
+            return Response.noContent().build();
+        } catch (ExtsysException e) {
+            LOG.error("Delete VNFM from A&AI failed! VNFM ID: " + vnfmId + "resouce-version:" + resourceVersion, e);
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+        }
     }
-  }
 
-  private VnfmRegisterInfo queryVnfmDetail(String vnfmId) {
-    VnfmRegisterInfo vnfm = new VnfmRegisterInfo();
-    EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
-    try {
-      String esrVnfmstr = ExternalSystemProxy.queryVnfmDetail(vnfmId);
-      LOG.info("Response from AAI by query VNFM: " + esrVnfmstr);
-      esrVnfmDetail = new Gson().fromJson(esrVnfmstr, EsrVnfmDetail.class);
-      vnfm = vnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail);
-      return vnfm;
-    } catch (Exception e) {
-      e.printStackTrace();
-      LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e.getMessage());
-      return null;
+    private VnfmRegisterInfo queryVnfmDetail(String vnfmId) {
+        VnfmRegisterInfo vnfm = new VnfmRegisterInfo();
+        EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
+        try {
+            String esrVnfmstr = externalSystemProxy.queryVnfmDetail(vnfmId);
+            LOG.info("Response from AAI by query VNFM: " + esrVnfmstr);
+            esrVnfmDetail = new Gson().fromJson(esrVnfmstr, EsrVnfmDetail.class);
+            vnfm = vnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail);
+        } catch (ExtsysException e) {
+            LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e);
+        }
+        return vnfm;
     }
-  }
 
-  private ArrayList<VnfmRegisterInfo> getVnfmDetailList(EsrVnfmList esrVnfm) {
-    ArrayList<VnfmRegisterInfo> vnfmInfoList = new ArrayList<VnfmRegisterInfo>();
-    VnfmRegisterInfo vnfmInfo = new VnfmRegisterInfo();
-    for (int i = 0; i < esrVnfm.getEsrVnfm().size(); i++) {
-      String vnfmId = esrVnfm.getEsrVnfm().get(i).getVnfmId();
-      vnfmInfo = queryVnfmDetail(vnfmId);
-      if (vnfmInfo != null) {
-        vnfmInfoList.add(vnfmInfo);
-      }
+    private List<VnfmRegisterInfo> getVnfmDetailList(EsrVnfmList esrVnfm) {
+        List<VnfmRegisterInfo> vnfmInfoList = new ArrayList<>();
+        for (int i = 0; i < esrVnfm.getEsrVnfm().size(); i++) {
+            String vnfmId = esrVnfm.getEsrVnfm().get(i).getVnfmId();
+            VnfmRegisterInfo vnfmInfo = queryVnfmDetail(vnfmId);
+            if (vnfmInfo != null) {
+                vnfmInfoList.add(vnfmInfo);
+            }
+        }
+        return vnfmInfoList;
     }
-    return vnfmInfoList;
-  }
-  
-  private String getResourceVersion (String vnfmId) {
-    EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
-    String resourceVersion = null;
-    esrVnfmDetail = queryEsrVnfmDetail(vnfmId);
-    if (esrVnfmDetail != null && esrVnfmDetail.getResourceVersion() != null) {
-      resourceVersion = esrVnfmDetail.getResourceVersion();
+
+    private String getResourceVersion(String vnfmId) {
+        String resourceVersion = null;
+        EsrVnfmDetail esrVnfmDetail = queryEsrVnfmDetail(vnfmId);
+        if (esrVnfmDetail != null && esrVnfmDetail.getResourceVersion() != null) {
+            resourceVersion = esrVnfmDetail.getResourceVersion();
+        }
+        return resourceVersion;
     }
-    return resourceVersion;
-  }
-  
-  private EsrVnfmDetail queryEsrVnfmDetail (String vnfmId) {
-    EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
-    try {
-      String esrVnfmstr = ExternalSystemProxy.queryVnfmDetail(vnfmId);
-      LOG.info("Response from AAI by query VNFM: " + esrVnfmstr);
-      esrVnfmDetail = new Gson().fromJson(esrVnfmstr, EsrVnfmDetail.class);
-    } catch (Exception e) {
-      e.printStackTrace();
-      LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e.getMessage());
+
+    private EsrVnfmDetail queryEsrVnfmDetail(String vnfmId) {
+        EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
+        try {
+            String esrVnfmstr = externalSystemProxy.queryVnfmDetail(vnfmId);
+            LOG.info("Response from AAI by query VNFM: " + esrVnfmstr);
+            esrVnfmDetail = new Gson().fromJson(esrVnfmstr, EsrVnfmDetail.class);
+        } catch (ExtsysException e) {
+            LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e);
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+        }
+        return esrVnfmDetail;
     }
-    return esrVnfmDetail;
-  }
 }