Fix sonar issues

Change-Id: I87fdb199c591093d726ae807e501da94f61cfb5a
Issue-ID: VFC-728
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>

3 files changed, 31 insertions, 33 deletions

diff --git a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/so/SoLifecycleManager.java b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/so/SoLifecycleManager.java
index c6e07e83..2d2f0159 100644
--- a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/so/SoLifecycleManager.java
+++ b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/so/SoLifecycleManager.java
@@ -31,7 +31,6 @@ import org.onap.vnfmadapter.so.model.*;
 import org.onap.vnfmdriver.model.ExtVirtualLinkInfo;
 import org.onap.vnfmdriver.model.*;
 import org.onap.vnfmdriver.model.VnfInfo;
-import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -42,8 +41,6 @@ import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.notification
 import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.CbamRestApiProvider.NOKIA_LCM_API_VERSION;
 import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.LifecycleManager.getVnfdIdFromModifyableAttributes;
 import static org.onap.vnfmadapter.so.model.SoJobStatus.*;
-import static org.slf4j.LoggerFactory.getLogger;
-import static org.springframework.util.StringUtils.isEmpty;
 
 /**
  * Responsible for providing access to AAI APIs.
@@ -52,7 +49,6 @@ import static org.springframework.util.StringUtils.isEmpty;
 
 @Component
 public class SoLifecycleManager {
-    private static Logger logger = getLogger(SoLifecycleManager.class);
     private final LifecycleManager lifecycleManager;
     private final VimInfoProvider vimInfoProvider;
     private final CbamRestApiProvider cbamRestApiProvider;
@@ -96,9 +92,7 @@ public class SoLifecycleManager {
         org.onap.vnfmdriver.model.VimInfo vimInfo = vimInfoProvider.getVimInfo(vimId);
         additionalParameters.setVimType(vimTypeHeuristic(vimInfo.getUrl()));
         processVdus(soRequest, additionalParameters, vimId);
-        if (isEmpty(additionalParameters.getInstantiationLevel())) {
-            additionalParameters.setInstantiationLevel("default");
-        }
+        additionalParameters.setInstantiationLevel("default");
         processNetworks(soRequest, additionalParameters, vimId);
         processZones(soRequest, additionalParameters, vimId);
         com.nokia.cbam.lcm.v32.model.VnfInfo cbamVnfInfo = cbamRestApiProvider.getCbamLcmApi(vnfmId).vnfsVnfInstanceIdGet(vnfId, NOKIA_LCM_API_VERSION).blockingFirst();
@@ -158,8 +152,13 @@ public class SoLifecycleManager {
      */
     public SoJobHandler deactivate(String vnfmId, String vnfId, SoVnfTerminationRequest soRequest, HttpServletResponse httpResponse) {
         VnfTerminateRequest driverRequest = new VnfTerminateRequest();
-        driverRequest.setTerminationType(soRequest.getMode() == SoTerminationMode.FORCEFUL ? VnfTerminationType.FORCEFUL : VnfTerminationType.GRACEFUL);
-        driverRequest.setGracefulTerminationTimeout(soRequest.getGracefulTerminationTimeoutInMs().toString());
+        if (soRequest.getMode() == SoTerminationMode.FORCEFUL) {
+            driverRequest.setTerminationType(VnfTerminationType.FORCEFUL);
+        } else {
+            driverRequest.setTerminationType(VnfTerminationType.GRACEFUL);
+            driverRequest.setGracefulTerminationTimeout(soRequest.getGracefulTerminationTimeoutInMs().toString());
+
+        }
         return buildJobHandler(lifecycleManager.terminateAndDelete(vnfmId, vnfId, driverRequest, httpResponse).getJobId());
     }
 
@@ -256,12 +255,16 @@ public class SoLifecycleManager {
                 ExtVirtualLinkData extVirtualLinkData = createExtVirtualLinkData(additionalParameters, networkMapping.getVldId());
                 extVirtualLinkData.setVimId(vimId);
                 extVirtualLinkData.setResourceId(networkMapping.getNetworkProviderId());
-                if (networkMapping.getAssignedAddresses() != null) {
-                    for (SoAssignedAddresses assignedAddresses : networkMapping.getAssignedAddresses()) {
-                        VnfExtCpData extCpData = createExtVirtualLinkData(extVirtualLinkData.getExtCps(), assignedAddresses.getCpdId());
-                        addMissing(extCpData, assignedAddresses.getIpAddress());
-                    }
-                }
+                processAssingedAddress(networkMapping, extVirtualLinkData);
+            }
+        }
+    }
+
+    private void processAssingedAddress(SoNetworkMapping networkMapping, ExtVirtualLinkData extVirtualLinkData) {
+        if (networkMapping.getAssignedAddresses() != null) {
+            for (SoAssignedAddresses assignedAddresses : networkMapping.getAssignedAddresses()) {
+                VnfExtCpData extCpData = createExtVirtualLinkData(extVirtualLinkData.getExtCps(), assignedAddresses.getCpdId());
+                addMissing(extCpData, assignedAddresses.getIpAddress());
             }
         }
     }
@@ -277,11 +280,9 @@ public class SoLifecycleManager {
     }
 
     private ZoneInfo locateOrCreateZone(List<ZoneInfo> zones, String vduId) {
-        if (zones != null) {
-            for (ZoneInfo zone : zones) {
-                if (zone.getId().equals(vduId)) {
-                    return zone;
-                }
+        for (ZoneInfo zone : zones) {
+            if (zone.getId().equals(vduId)) {
+                return zone;
             }
         }
         ZoneInfo zoneInfo = new ZoneInfo();
@@ -305,11 +306,9 @@ public class SoLifecycleManager {
     }
 
     private VnfExtCpData createExtVirtualLinkData(List<VnfExtCpData> extCps, String cpdId) {
-        if (extCps != null) {
-            for (VnfExtCpData extCp : extCps) {
-                if (extCp.getCpdId().equals(cpdId)) {
-                    return extCp;
-                }
+        for (VnfExtCpData extCp : extCps) {
+            if (extCp.getCpdId().equals(cpdId)) {
+                return extCp;
             }
         }
         VnfExtCpData extCp = new VnfExtCpData();
diff --git a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/SoApi.java b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/SoApi.java
index b2c833bb..f3b4a1e6 100644
--- a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/SoApi.java
+++ b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/SoApi.java
@@ -43,7 +43,6 @@ public class SoApi {
 
     private final SoLifecycleManager soLifecycleManager;
 
-    //private final LifecycleManager d;
     @Autowired
     SoApi(SoLifecycleManager lifecycleManager) {
         this.soLifecycleManager = lifecycleManager;
@@ -77,7 +76,7 @@ public class SoApi {
     @RequestMapping(value = "/{vnfmId}/vnfs/{vnfId}", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
     @ResponseBody
     public SoJobHandler activateVnf(@RequestBody SoVnfActivationRequest request, @PathVariable("vnfmId") String vnfmId, @PathVariable("vnfId") String vnfId, HttpServletResponse httpResponse) {
-        logger.info("REST: Create the VNF");
+        logger.info("REST: Activate the VNF");
         return soLifecycleManager.activate(vnfmId, vnfId, request, httpResponse);
     }
 
@@ -92,7 +91,7 @@ public class SoApi {
     @RequestMapping(value = "/{vnfmId}/vnfs/{vnfId}/customOperation", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
     @ResponseBody
     public SoJobHandler executeCustomOperation(@RequestBody SoVnfCustomOperation request, @PathVariable("vnfmId") String vnfmId, @PathVariable("vnfId") String vnfId, HttpServletResponse httpResponse) {
-        logger.info("REST: Create the VNF");
+        logger.info("REST: Execute custom operation on the VNF");
         return soLifecycleManager.customOperation(vnfmId, vnfId, request, httpResponse);
     }
 
@@ -108,7 +107,7 @@ public class SoApi {
     @RequestMapping(value = "/{vnfmId}/vnfs/{vnfId}/terminate", method = POST, produces = APPLICATION_JSON_VALUE)
     @ResponseBody
     public SoJobHandler deactivateVnf(@RequestBody SoVnfTerminationRequest request, @PathVariable("vnfmId") String vnfmId, @PathVariable("vnfId") String vnfId, HttpServletResponse httpResponse) {
-        logger.info("REST: Deactivate VNF");
+        logger.info("REST: Deactivate the VNF");
         return soLifecycleManager.deactivate(vnfmId, vnfId, request, httpResponse);
     }
 
@@ -121,7 +120,7 @@ public class SoApi {
      */
     @RequestMapping(value = "/{vnfmId}/vnfs/{vnfId}", method = DELETE)
     public void deleteVnf(@PathVariable("vnfmId") String vnfmId, @PathVariable("vnfId") String vnfId, HttpServletResponse httpResponse) {
-        logger.info("REST: Delete VNF");
+        logger.info("REST: Delete the VNF");
         soLifecycleManager.delete(vnfmId, vnfId);
         httpResponse.setStatus(HttpServletResponse.SC_NO_CONTENT);
     }
@@ -137,7 +136,7 @@ public class SoApi {
     @RequestMapping(value = "/{vnfmId}/jobs/{jobId}", method = GET, produces = APPLICATION_JSON_VALUE)
     @ResponseBody
     public SoJobDetail getJob(@PathVariable("vnfmId") String vnfmId, @PathVariable("jobId") String jobId, HttpServletResponse httpResponse) {
-        logger.debug("REST: Query the job");
+        logger.trace("REST: Query the job");
         return soLifecycleManager.getJobDetails(vnfmId, jobId);
     }
 
diff --git a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/LifecycleManager.java b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/LifecycleManager.java
index 5cd11058..b7dd7168 100644
--- a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/LifecycleManager.java
+++ b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/LifecycleManager.java
@@ -253,7 +253,7 @@ public class LifecycleManager {
             return buildOpenStackV2INFO(vimId, vim, vimInfo);
 
         } else if (additionalParameters.getVimType() == OPENSTACK_V3_INFO) {
-            return buildOpenStackV3INFO(vimId, additionalParameters, vim, vimInfo);
+            return buildOpenStackV3INFO(vimId, vim, vimInfo);
 
         } else {
             //OTHER VIM TYPE is not possible
@@ -329,7 +329,7 @@ public class LifecycleManager {
         }
     }
 
-    private OPENSTACKV3INFO buildOpenStackV3INFO(String vimId, AdditionalParameters additionalParameters, GrantVNFResponseVim vim, org.onap.vnfmdriver.model.VimInfo vimInfo) {
+    private OPENSTACKV3INFO buildOpenStackV3INFO(String vimId, GrantVNFResponseVim vim, org.onap.vnfmdriver.model.VimInfo vimInfo) {
         OPENSTACKV3INFO openstackv3INFO = new OPENSTACKV3INFO();
         openstackv3INFO.setVimInfoType(OPENSTACK_V3_INFO);
         OpenStackAccessInfoV3 accessInfov3 = new OpenStackAccessInfoV3();