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=584a15696f447cd54665b5465a0ef6cdb61a0e1a;hp=c53a1c8f969c941e8e92edd8a95196958533209e;hb=769718b3e8b4e659299602701b575cf1b4b182c5;hpb=90efb9e11e77ce4f0a58fccfd7488a432b989596

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 c53a1c8..584a156 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,6 +16,7 @@
 package org.onap.aai.esr.wrapper;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import javax.ws.rs.core.Response;
 
@@ -53,8 +54,7 @@ public class VnfmManagerWrapper {
 
   public Response registerVnfm(VnfmRegisterInfo vnfm) {
     CommonRegisterResponse result = new CommonRegisterResponse();
-    EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
-    esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
+    EsrVnfmDetail esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
     String vnfmId = esrVnfmDetail.getVnfmId();
     try {
       ExternalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail);
@@ -68,15 +68,12 @@ public class VnfmManagerWrapper {
 
   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);
+    EsrVnfmDetail originalEsrVnfmDetail = queryEsrVnfmDetail(vnfmId);
+    EsrVnfmDetail esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
     String resourceVersion = getResourceVersion(vnfmId);
     esrVnfmDetail.setResourceVersion(resourceVersion);
     esrVnfmDetail.setVnfmId(vnfmId);
-    originalEsrSystemInfo = originalEsrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);
+    EsrSystemInfo originalEsrSystemInfo = originalEsrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);
     esrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
         .setEsrSystemInfoId(originalEsrSystemInfo.getEsrSystemInfoId());
     esrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
@@ -92,7 +89,7 @@ public class VnfmManagerWrapper {
   }
 
   public Response queryVnfmList() {
-    ArrayList<VnfmRegisterInfo> vnfmList = new ArrayList<VnfmRegisterInfo>();
+    List<VnfmRegisterInfo> vnfmList = new ArrayList<>();
     EsrVnfmList esrVnfm = new EsrVnfmList();
     try {
       String esrVnfmStr = ExternalSystemProxy.queryVnfmList();
@@ -107,8 +104,7 @@ public class VnfmManagerWrapper {
   }
 
   public Response queryVnfmById(String vnfmId) {
-    VnfmRegisterInfo vnfm = new VnfmRegisterInfo();
-    vnfm = queryVnfmDetail(vnfmId);
+    VnfmRegisterInfo vnfm = queryVnfmDetail(vnfmId);
     if (vnfm != null) {
       return Response.ok(vnfm).build();
     } else {
@@ -143,12 +139,11 @@ public class VnfmManagerWrapper {
     return vnfm;
   }
 
-  private ArrayList<VnfmRegisterInfo> getVnfmDetailList(EsrVnfmList esrVnfm) {
-    ArrayList<VnfmRegisterInfo> vnfmInfoList = new ArrayList<VnfmRegisterInfo>();
-    VnfmRegisterInfo vnfmInfo = new VnfmRegisterInfo();
+  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();
-      vnfmInfo = queryVnfmDetail(vnfmId);
+      VnfmRegisterInfo vnfmInfo = queryVnfmDetail(vnfmId);
       if (vnfmInfo != null) {
         vnfmInfoList.add(vnfmInfo);
       }
@@ -157,9 +152,8 @@ public class VnfmManagerWrapper {
   }
   
   private String getResourceVersion (String vnfmId) {
-    EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
     String resourceVersion = null;
-    esrVnfmDetail = queryEsrVnfmDetail(vnfmId);
+    EsrVnfmDetail esrVnfmDetail = queryEsrVnfmDetail(vnfmId);
     if (esrVnfmDetail != null && esrVnfmDetail.getResourceVersion() != null) {
       resourceVersion = esrVnfmDetail.getResourceVersion();
     }