From 3693992e59252f2d3691094fa5fcef4bad7e14d1 Mon Sep 17 00:00:00 2001 From: rama-huawei Date: Thu, 12 Oct 2017 19:18:53 +0530 Subject: Iterate over "entrySet" instead of "keySet" Issue-id: SO-214 Change-Id: Ic402b02a82bd613b0753db1530dd76ce59c3ad08 Signed-off-by: rama-huawei --- .../openecomp/mso/adapters/nwrest/CreateNetworkRequest.java | 2 +- .../mso/adapters/sdnc/sdncrest/SDNCServiceRequestTask.java | 2 +- .../openecomp/mso/adapters/tenant/MsoTenantAdapterImpl.java | 2 +- .../openecomp/mso/adapters/vnf/MsoVnfAdapterAsyncImpl.java | 12 ++++++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/CreateNetworkRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/CreateNetworkRequest.java index 9def0a4878..061da6fca2 100644 --- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/CreateNetworkRequest.java +++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/CreateNetworkRequest.java @@ -67,7 +67,7 @@ public class CreateNetworkRequest extends NetworkRequestCommon { private ContrailNetwork contrailNetwork; private Boolean failIfExists = false; private Boolean backout = true; - private Map networkParams = new HashMap(); + private Map networkParams = new HashMap<>(); private MsoRequest msoRequest = new MsoRequest(); public CreateNetworkRequest() { diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestTask.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestTask.java index 3e908e4296..2c5355f5fb 100644 --- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestTask.java +++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestTask.java @@ -196,7 +196,7 @@ public class SDNCServiceRequestTask implements Runnable { } catch (Exception e) { LOGGER.error(MessageEnum.RA_ERROR_CONVERT_XML2STR, "", "", MsoLogger.ErrorCode.DataError, "Exception - domToStr", e); - return(null); + return null; } LOGGER.debug("Formatted SDNC service request XML:\n" + xml); diff --git a/adapters/mso-tenant-adapter/src/main/java/org/openecomp/mso/adapters/tenant/MsoTenantAdapterImpl.java b/adapters/mso-tenant-adapter/src/main/java/org/openecomp/mso/adapters/tenant/MsoTenantAdapterImpl.java index a875a862aa..29f5630586 100644 --- a/adapters/mso-tenant-adapter/src/main/java/org/openecomp/mso/adapters/tenant/MsoTenantAdapterImpl.java +++ b/adapters/mso-tenant-adapter/src/main/java/org/openecomp/mso/adapters/tenant/MsoTenantAdapterImpl.java @@ -103,7 +103,7 @@ public class MsoTenantAdapterImpl implements MsoTenantAdapter { MsoTenantUtils tUtils = tFactory.getTenantUtils (cloudSiteId); MsoTenant newTenant = null; - String newTenantId = null; + String newTenantId; long queryTenantStartTime = System.currentTimeMillis (); try { newTenant = tUtils.queryTenantByName (tenantName, cloudSiteId); diff --git a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterAsyncImpl.java b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterAsyncImpl.java index b3756c4ccb..15a4e0ab94 100644 --- a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterAsyncImpl.java +++ b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterAsyncImpl.java @@ -555,9 +555,11 @@ public class MsoVnfAdapterAsyncImpl implements MsoVnfAdapterAsync { sMap = hMap.value; UpdateVnfNotification.Outputs.Entry entry = new UpdateVnfNotification.Outputs.Entry (); - for (String key : sMap.keySet ()) { + for (Map.Entry mapEntry : sMap.entrySet ()) { + String key = mapEntry.getKey(); + String value = mapEntry.getValue(); entry.setKey (key); - entry.setValue (sMap.get (key)); + entry.setValue (value); outputs.getEntry ().add (entry); } } @@ -574,9 +576,11 @@ public class MsoVnfAdapterAsyncImpl implements MsoVnfAdapterAsync { QueryVnfNotification.Outputs.Entry entry = new QueryVnfNotification.Outputs.Entry (); - for (String key : sMap.keySet ()) { + for (Map.Entry mapEntry : sMap.entrySet ()) { + String key = mapEntry.getKey(); + String value = mapEntry.getValue(); entry.setKey (key); - entry.setValue (sMap.get (key)); + entry.setValue (value); outputs.getEntry ().add (entry); } } -- cgit 1.2.3-korg