Merge "Swap while loops with foreach where applicable"

[so.git] / bpmn / MSOCoreBPMN / src / main / java / org / openecomp / mso / bpmn / core / domain / ServiceDecomposition.java

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 f5283f4..c81e96d 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