Swap while loops with foreach where applicable

Change-Id: Id3b54e8192f0e60657aa4c50af56c1ef98fbff5e
Issue-ID: SO-437
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>

diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoYamlEditorWithEnvt.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoYamlEditorWithEnvt.java
index c227d72..8002087 100644 (file)
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoYamlEditorWithEnvt.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoYamlEditorWithEnvt.java
@@ -27,6 +27,7 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
@@ -73,33 +74,32 @@ public class MsoYamlEditorWithEnvt {
        if (resourceMap == null) {
                return paramSet;
        }
-       Iterator <Entry <String, Object>> it = resourceMap.entrySet().iterator();
-       
-       while (it.hasNext()) {
-               MsoHeatEnvironmentParameter hep = new MsoHeatEnvironmentParameter();
-               Map.Entry <String, Object> pair = it.next();
-               String value;
-               Object obj = pair.getValue();
-               if (obj instanceof java.lang.String) {
-                       value = yaml.dump(obj);
-                       // but this adds an extra '\n' at the end - which won't hurt - but we don't need it
-                       value = value.substring(0, value.length() - 1);
-               } else if (obj instanceof java.util.LinkedHashMap) {
-                       //Handle that it's json
-                       try {
-                               value = JSON_MAPPER.writeValueAsString(obj);
-                       } catch (Exception e) {
-                           LOGGER.debug("Exception:", e);
-                               value = "_BAD_JSON_MAPPING";
-                       }
-               } else {
-                       //this handles integers/longs/floats/etc.
-                       value = String.valueOf(obj);
-               }
-               hep.setName((String) pair.getKey());
-               hep.setValue(value);
-               paramSet.add(hep);
-       }
+
+        for (Entry<String, Object> stringObjectEntry : resourceMap.entrySet()) {
+            MsoHeatEnvironmentParameter hep = new MsoHeatEnvironmentParameter();
+            Entry<String, Object> pair = stringObjectEntry;
+            String value;
+            Object obj = pair.getValue();
+            if (obj instanceof String) {
+                value = yaml.dump(obj);
+                // but this adds an extra '\n' at the end - which won't hurt - but we don't need it
+                value = value.substring(0, value.length() - 1);
+            } else if (obj instanceof LinkedHashMap) {
+                //Handle that it's json
+                try {
+                    value = JSON_MAPPER.writeValueAsString(obj);
+                } catch (Exception e) {
+                    LOGGER.debug("Exception:", e);
+                    value = "_BAD_JSON_MAPPING";
+                }
+            } else {
+                //this handles integers/longs/floats/etc.
+                value = String.valueOf(obj);
+            }
+            hep.setName((String) pair.getKey());
+            hep.setValue(value);
+            paramSet.add(hep);
+        }
        return paramSet;
     }
     public synchronized Set <MsoHeatEnvironmentResource> getResourceListFromEnvt() {
@@ -107,15 +107,14 @@ public class MsoYamlEditorWithEnvt {
                Set<MsoHeatEnvironmentResource> resourceList = new HashSet<>();
                @SuppressWarnings("unchecked")
                Map<String, Object> resourceMap = (Map<String,Object>) yml.get("resource_registry");
-               Iterator<Entry <String,Object>> it = resourceMap.entrySet().iterator();
-       
-               while (it.hasNext()) {
-                       MsoHeatEnvironmentResource her = new MsoHeatEnvironmentResource();
-                       Map.Entry<String, Object> pair = it.next();
-                       her.setName((String) pair.getKey());
-                       her.setValue((String) pair.getValue());
-                       resourceList.add(her);
-               }
+
+            for (Entry<String, Object> stringObjectEntry : resourceMap.entrySet()) {
+                MsoHeatEnvironmentResource her = new MsoHeatEnvironmentResource();
+                Entry<String, Object> pair = stringObjectEntry;
+                her.setName((String) pair.getKey());
+                her.setValue((String) pair.getValue());
+                resourceList.add(her);
+            }
                return resourceList;
        } catch (Exception e) {
            LOGGER.debug("Exception:", e);
@@ -126,35 +125,34 @@ public class MsoYamlEditorWithEnvt {
         Set <HeatTemplateParam> paramSet = new HashSet <> ();
         @SuppressWarnings("unchecked")
         Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("parameters");
-        Iterator <Entry <String, Object>> it = resourceMap.entrySet ().iterator ();
 
-        while (it.hasNext ()) {
-            HeatTemplateParam param = new HeatTemplateParam ();
-            Map.Entry <String, Object> pair = it.next ();
+        for (Entry<String, Object> stringObjectEntry : resourceMap.entrySet()) {
+            HeatTemplateParam param = new HeatTemplateParam();
+            Entry<String, Object> pair = stringObjectEntry;
             @SuppressWarnings("unchecked")
-            Map <String, String> resourceEntry = (Map <String, String>) pair.getValue ();
+            Map<String, String> resourceEntry = (Map<String, String>) pair.getValue();
             String value = null;
             try {
-               value = resourceEntry.get ("default");
-            } catch (java.lang.ClassCastException cce) {
+                value = resourceEntry.get("default");
+            } catch (ClassCastException cce) {
                 LOGGER.debug("Exception:", cce);
-               // This exception only - the value is an integer. For what we're doing
-               // here - we don't care - so set value to something - and it will 
-               // get marked as not being required - which is correct.
-               //System.out.println("cce exception!");
-               value = "300"; 
-               // okay
+                // This exception only - the value is an integer. For what we're doing
+                // here - we don't care - so set value to something - and it will
+                // get marked as not being required - which is correct.
+                //System.out.println("cce exception!");
+                value = "300";
+                // okay
             }
-            param.setParamName ((String) pair.getKey ());
+            param.setParamName((String) pair.getKey());
             if (value != null) {
-                param.setRequired (false);
+                param.setRequired(false);
             } else {
-                param.setRequired (true);
+                param.setRequired(true);
             }
-            value = resourceEntry.get ("type");
-            param.setParamType (value);
+            value = resourceEntry.get("type");
+            param.setParamType(value);
 
-            paramSet.add (param);
+            paramSet.add(param);
 
         }
         return paramSet;

diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/YamlEditor.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/YamlEditor.java
index f94e0a1..a90fdeb 100644 (file)
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/YamlEditor.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/YamlEditor.java
@@ -82,12 +82,10 @@ public class YamlEditor {
 
         @SuppressWarnings("unchecked")
         Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("resources");
-        Iterator <Entry <String, Object>> it = resourceMap.entrySet ().iterator ();
-        while (it.hasNext ()) {
-            Map.Entry <String, Object> pair = it.next ();
+        for (Entry<String, Object> pair : resourceMap.entrySet()) {
             @SuppressWarnings("unchecked")
-            Map <String, String> resourceEntry = (Map <String, String>) pair.getValue ();
-            typeList.add (resourceEntry.get ("type"));
+            Map<String, String> resourceEntry = (Map<String, String>) pair.getValue();
+            typeList.add(resourceEntry.get("type"));
         }
         return typeList;
     }    
@@ -100,28 +98,27 @@ public class YamlEditor {
         Set <HeatTemplateParam> paramSet = new HashSet <HeatTemplateParam> ();
         @SuppressWarnings("unchecked")
         Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("parameters");
-        Iterator <Entry <String, Object>> it = resourceMap.entrySet ().iterator ();
 
-        while (it.hasNext ()) {
-            HeatTemplateParam param = new HeatTemplateParam ();
-            Map.Entry <String, Object> pair = it.next ();
+        for (Entry<String, Object> stringObjectEntry : resourceMap.entrySet()) {
+            HeatTemplateParam param = new HeatTemplateParam();
+            Entry<String, Object> pair = stringObjectEntry;
             @SuppressWarnings("unchecked")
-            Map <String, String> resourceEntry = (Map <String, String>) pair.getValue ();
-            
-            param.setParamName (pair.getKey ());
+            Map<String, String> resourceEntry = (Map<String, String>) pair.getValue();
+
+            param.setParamName(pair.getKey());
             // System.out.println(pair.getKey()+":"+type);
             if (resourceEntry.containsKey("default")) {
-                param.setRequired (false);
+                param.setRequired(false);
             } else {
-                param.setRequired (true);
+                param.setRequired(true);
             }
             // Now set the type
-            String value = resourceEntry.get ("type");
-            param.setParamType (value);
-            
+            String value = resourceEntry.get("type");
+            param.setParamType(value);
+
             param.setHeatTemplateArtifactUuid(artifactUUID);
 
-            paramSet.add (param);
+            paramSet.add(param);
 
         }
         return paramSet;

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapPropertiesLoader.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapPropertiesLoader.java
index a21dbe8..1bdecbf 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapPropertiesLoader.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapPropertiesLoader.java
@@ -39,9 +39,8 @@ public class DmaapPropertiesLoader {
        }
        
        public DmaapProperties getImpl() {
-               Iterator<DmaapProperties> propertyImpls = services.iterator();
-               while (propertyImpls.hasNext()) {
-                       return propertyImpls.next();
+               for (DmaapProperties service : services) {
+                       return service;
                }
                
                return null;

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ServiceDecomposition.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ServiceDecomposition.java
index 0e985cc..15a1cee 100644 (file)
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ServiceDecomposition.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ServiceDecomposition.java
@@ -186,15 +186,13 @@ public class ServiceDecomposition extends JsonWrapper implements Serializable {
        @JsonIgnore\r
        public String getVnfResource(String resourceObjectId) {\r
 \r
-               Iterator<Resource> iter = getServiceResources().iterator();\r
-               while (iter.hasNext()) {\r
-                       Resource resource = iter.next();\r
-                       //resource.getModelInfo().getModelInvariantId();\r
+        for (Resource resource : getServiceResources()) {\r
+            //resource.getModelInfo().getModelInvariantId();\r
 \r
-                       if ("extracted information".equals(resourceObjectId)){\r
-                               return resource.toJsonString();\r
-                       }\r
-               }\r
+            if ("extracted information".equals(resourceObjectId)) {\r
+                return resource.toJsonString();\r
+            }\r
+        }\r
                return "";\r
        }\r
 \r
@@ -290,13 +288,11 @@ public class ServiceDecomposition extends JsonWrapper implements Serializable {
        public boolean replaceResource(Resource newResource){\r
                boolean result = false;\r
                List serviceResources = getServiceResources();\r
-               Iterator<Resource> iter = serviceResources.iterator();\r
-               while (iter.hasNext()) {\r
-                       Resource resource = iter.next();\r
+               for (Resource resource : (Iterable<Resource>) serviceResources) {\r
                        System.out.println("resource found");\r
-                       if (resource.resourceType == newResource.resourceType){\r
+                       if (resource.resourceType == newResource.resourceType) {\r
                                System.out.println("resource type matches");\r
-                               if (resource.getResourceId().equalsIgnoreCase(newResource.getResourceId())){\r
+                               if (resource.getResourceId().equalsIgnoreCase(newResource.getResourceId())) {\r
                                        System.out.println("resource id matches");\r
                                        //returns TRUE if replacement is a success\r
                                        result = Collections.replaceAll(serviceResources, resource, newResource);\r
@@ -326,12 +322,9 @@ public class ServiceDecomposition extends JsonWrapper implements Serializable {
         */\r
        public boolean deleteResource(Resource resource){\r
                List serviceResources = getServiceResources();\r
-               Iterator<Resource> iter = serviceResources.iterator();\r
-               while (iter.hasNext()) {\r
-                       Resource item = iter.next();\r
-\r
-                       if (item.resourceType == resource.resourceType){\r
-                               if (item.getResourceId().equalsIgnoreCase(resource.getResourceId())){\r
+               for (Resource item : (Iterable<Resource>) serviceResources) {\r
+                       if (item.resourceType == resource.resourceType) {\r
+                               if (item.getResourceId().equalsIgnoreCase(resource.getResourceId())) {\r
                                        //returns TRUE if replacement is a success\r
                                        return serviceResources.remove(resource);\r
                                }\r
@@ -377,10 +370,8 @@ public class ServiceDecomposition extends JsonWrapper implements Serializable {
        @JsonIgnore\r
        public Resource getServiceResource(String resourceId){\r
                List<Resource> resources = getServiceResources();\r
-               Iterator<Resource> iter = resources.iterator();\r
-               while (iter.hasNext()){\r
-                       Resource resource = iter.next();\r
-                       if (resource.getResourceId().equalsIgnoreCase(resourceId)){\r
+               for (Resource resource : resources) {\r
+                       if (resource.getResourceId().equalsIgnoreCase(resourceId)) {\r
                                //match\r
                                return resource;\r
                        }\r