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%2FVimManagerWrapper.java;h=ce80807dff6c47ab109595d96fcd01a07dcde9e0;hp=e34217dc405be586ae5e47747d75f0dde099a5b5;hb=7051ea74d3d0d2cd15de7acec391c1f08563fea3;hpb=486ed42762fedbc7cd0cc43704389ed41434eacd

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
index e34217d..ce80807 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
@@ -60,9 +60,8 @@ public class VimManagerWrapper {
 
     public Response registerVim(VimRegisterInfo vimRegisterInfo) {
         LOG.info("Start register VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo));
-        CloudRegionDetail cloudRegion = new CloudRegionDetail();
         VimRegisterResponse result = new VimRegisterResponse();
-        cloudRegion = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
+        CloudRegionDetail cloudRegion = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
         String cloudOwner = vimRegisterInfo.getCloudOwner();
         String cloudRegionId = vimRegisterInfo.getCloudRegionId();
         try {
@@ -85,10 +84,9 @@ public class VimManagerWrapper {
 
     public Response updateVim(String cloudOwner, String cloudRegionId, VimRegisterInfo vimRegisterInfo) {
         LOG.info("Start update VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo));
-        CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
         VimRegisterResponse result = new VimRegisterResponse();
 
-        cloudRegionDetail = getVimUpdateInfo(vimRegisterInfo);
+        CloudRegionDetail cloudRegionDetail = getVimUpdateInfo(vimRegisterInfo);
         try {
             cloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegionDetail);
             result.setCloudOwner(cloudOwner);
@@ -133,12 +131,11 @@ public class VimManagerWrapper {
 
     private List<VimRegisterInfo> getVimDetailList(CloudRegionList cloudRegionList) {
         List<VimRegisterInfo> vimRegisterInfos = new ArrayList<>();
-        VimRegisterInfo vimRegisterInfo = new VimRegisterInfo();
         int cloudRegionNum = cloudRegionList.getCloudRegion().size();
         for (int i = 0; i < cloudRegionNum; i++) {
             String cloudOwner = cloudRegionList.getCloudRegion().get(i).getCloudOwner();
             String cloudRegionId = cloudRegionList.getCloudRegion().get(i).getCloudRegionId();
-            vimRegisterInfo = getVimDetail(cloudOwner, cloudRegionId);
+            VimRegisterInfo vimRegisterInfo = getVimDetail(cloudOwner, cloudRegionId);
             vimRegisterInfos.add(vimRegisterInfo);
         }
         return vimRegisterInfos;
@@ -172,17 +169,14 @@ public class VimManagerWrapper {
     }
 
     private CloudRegionDetail getVimUpdateInfo(VimRegisterInfo vimRegisterInfo) {
-        CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
-        CloudRegionDetail originalCloudRegionDetail = new CloudRegionDetail();
-        EsrSystemInfo originalSystemInfo = new EsrSystemInfo();
         String cloudOwner = vimRegisterInfo.getCloudOwner();
         String cloudRegionId = vimRegisterInfo.getCloudRegionId();
-        originalCloudRegionDetail = getOriginalCloudRegion(cloudOwner, cloudRegionId);
+        CloudRegionDetail originalCloudRegionDetail = getOriginalCloudRegion(cloudOwner, cloudRegionId);
         String resourceVersion = originalCloudRegionDetail.getResourceVersion();
-        cloudRegionDetail = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
+        CloudRegionDetail cloudRegionDetail = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
         if (resourceVersion != null) {
             cloudRegionDetail.setResourceVersion(resourceVersion);
-            originalSystemInfo = originalCloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);
+            EsrSystemInfo originalSystemInfo = originalCloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);
             cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
                     .setEsrSystemInfoId(originalSystemInfo.getEsrSystemInfoId());
             cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
@@ -192,8 +186,7 @@ public class VimManagerWrapper {
     }
 
     public Response delVim(String cloudOwner, String cloudRegionId) {
-        CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
-        cloudRegionDetail = queryCloudRegionDetail(cloudOwner, cloudRegionId);
+        CloudRegionDetail cloudRegionDetail = queryCloudRegionDetail(cloudOwner, cloudRegionId);
         String resourceVersion = cloudRegionDetail.getResourceVersion();
         try {
             cloudRegionProxy.deleteVim(cloudOwner, cloudRegionId, resourceVersion);