commit aec654c10520f3244523cf8b85b63a7a6524388d
author Phaneendra Manda <phaneendra.manda@huawei.com> Wed Sep 23 19:02:23 2015 +0530
committer Gerrit Code Review <gerrit@onlab.us> Wed Sep 23 16:54:12 2015 +0000
tree 82e3b2f2196852680d0541764e3dae3ed80f64b9
parent a9a73def6af2fec3bb0e8141b217b19ec0439196

Variable name changed for readability

Change-Id: Ie79aaacddd0c9a7885c55676ce69256603323ac8

web/api/src/main/java/org/onosproject/rest/resources/FlowsWebResource.java

diff --git a/web/api/src/main/java/org/onosproject/rest/resources/FlowsWebResource.java b/web/api/src/main/java/org/onosproject/rest/resources/FlowsWebResource.java
index 325e191..0e88e34 100644
--- a/web/api/src/main/java/org/onosproject/rest/resources/FlowsWebResource.java
+++ b/web/api/src/main/java/org/onosproject/rest/resources/FlowsWebResource.java
@@ -66,9 +66,9 @@
     public Response getFlows() {
         final Iterable<Device> devices = get(DeviceService.class).getDevices();
         for (final Device device : devices) {
-            final Iterable<FlowEntry> deviceEntries = service.getFlowEntries(device.id());
-            if (deviceEntries != null) {
-                for (final FlowEntry entry : deviceEntries) {
+            final Iterable<FlowEntry> flowEntries = service.getFlowEntries(device.id());
+            if (flowEntries != null) {
+                for (final FlowEntry entry : flowEntries) {
                     flowsNode.add(codec(FlowEntry.class).encode(entry, this));
                 }
             }
@@ -88,13 +88,13 @@
     @Produces(MediaType.APPLICATION_JSON)
     @Path("{deviceId}")
     public Response getFlowByDeviceId(@PathParam("deviceId") String deviceId) {
-        final Iterable<FlowEntry> deviceEntries =
+        final Iterable<FlowEntry> flowEntries =
                 service.getFlowEntries(DeviceId.deviceId(deviceId));
 
-        if (!deviceEntries.iterator().hasNext()) {
+        if (!flowEntries.iterator().hasNext()) {
             throw new ItemNotFoundException(DEVICE_NOT_FOUND);
         }
-        for (final FlowEntry entry : deviceEntries) {
+        for (final FlowEntry entry : flowEntries) {
             flowsNode.add(codec(FlowEntry.class).encode(entry, this));
         }
         return ok(root).build();
@@ -113,13 +113,13 @@
     @Path("{deviceId}/{flowId}")
     public Response getFlowByDeviceIdAndFlowId(@PathParam("deviceId") String deviceId,
                                                @PathParam("flowId") long flowId) {
-        final Iterable<FlowEntry> deviceEntries =
+        final Iterable<FlowEntry> flowEntries =
                 service.getFlowEntries(DeviceId.deviceId(deviceId));
 
-        if (!deviceEntries.iterator().hasNext()) {
+        if (!flowEntries.iterator().hasNext()) {
             throw new ItemNotFoundException(DEVICE_NOT_FOUND);
         }
-        for (final FlowEntry entry : deviceEntries) {
+        for (final FlowEntry entry : flowEntries) {
             if (entry.id().value() == flowId) {
                 flowsNode.add(codec(FlowEntry.class).encode(entry, this));
             }
@@ -175,14 +175,14 @@
     @Path("{deviceId}/{flowId}")
     public void deleteFlowByDeviceIdAndFlowId(@PathParam("deviceId") String deviceId,
                                               @PathParam("flowId") long flowId) {
-        final Iterable<FlowEntry> deviceEntries =
+        final Iterable<FlowEntry> flowEntries =
                 service.getFlowEntries(DeviceId.deviceId(deviceId));
 
-        if (!deviceEntries.iterator().hasNext()) {
+        if (!flowEntries.iterator().hasNext()) {
             throw new ItemNotFoundException(DEVICE_NOT_FOUND);
         }
 
-        StreamSupport.stream(deviceEntries.spliterator(), false)
+        StreamSupport.stream(flowEntries.spliterator(), false)
                 .filter(entry -> entry.id().value() == flowId)
                 .forEach(service::removeFlowRules);
     }