commit 8683e016780e283db78c476c0200b46419f92738
author Thomas Vachuska <tom@onlab.us> Wed Mar 18 18:03:33 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Mar 19 01:40:30 2015 +0000
tree 692a47738edd95e6f96d9e74a99495a40d71cc04
parent 166c54704156e59197aade2db95b681a3f3f55cd

Fixing codec usage.

Change-Id: I9101296a7ec4d4b13bf11df3e49e17afad79405e

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

diff --git a/web/api/src/main/java/org/onosproject/rest/FlowsWebResource.java b/web/api/src/main/java/org/onosproject/rest/FlowsWebResource.java
index 36afcce..be3288c 100644
--- a/web/api/src/main/java/org/onosproject/rest/FlowsWebResource.java
+++ b/web/api/src/main/java/org/onosproject/rest/FlowsWebResource.java
@@ -15,23 +15,21 @@
  */
 package org.onosproject.rest;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.onlab.util.ItemNotFoundException;
-import org.onosproject.codec.impl.FlowEntryCodec;
 import org.onosproject.net.Device;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.device.DeviceService;
 import org.onosproject.net.flow.FlowEntry;
 import org.onosproject.net.flow.FlowRuleService;
 
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 /**
  * REST resource for interacting with the inventory of flows.
@@ -44,7 +42,6 @@
     final FlowRuleService service = get(FlowRuleService.class);
     final ObjectNode root = mapper().createObjectNode();
     final ArrayNode flowsNode = root.putArray("flows");
-    final FlowEntryCodec flowEntryCodec = new FlowEntryCodec();
 
     /**
      * Gets an array containing all the intents in the system.
@@ -60,7 +57,7 @@
             final Iterable<FlowEntry> deviceEntries = service.getFlowEntries(device.id());
             if (deviceEntries != null) {
                 for (final FlowEntry entry : deviceEntries) {
-                    flowsNode.add(flowEntryCodec.encode(entry, this));
+                    flowsNode.add(codec(FlowEntry.class).encode(entry, this));
                 }
             }
         }
@@ -85,7 +82,7 @@
             throw new ItemNotFoundException(DEVICE_NOT_FOUND);
         }
         for (final FlowEntry entry : deviceEntries) {
-            flowsNode.add(flowEntryCodec.encode(entry, this));
+            flowsNode.add(codec(FlowEntry.class).encode(entry, this));
         }
         return ok(root).build();
     }
@@ -94,7 +91,7 @@
      * Gets the flows for a device, where the device is specified by Id.
      *
      * @param deviceId Id of device to look up
-     * @param flowId Id of flow to look up
+     * @param flowId   Id of flow to look up
      * @return flow data as an array
      */
     @GET
@@ -110,7 +107,7 @@
         }
         for (final FlowEntry entry : deviceEntries) {
             if (entry.id().value() == flowId) {
-                flowsNode.add(flowEntryCodec.encode(entry, this));
+                flowsNode.add(codec(FlowEntry.class).encode(entry, this));
             }
         }
         return ok(root).build();