commit c2a542bcab4512812a2ef18b07a08c93ac0ebec0
author Jian Li <pyguni@gmail.com> Tue May 10 11:48:19 2016 -0700
committer Jian Li <pyguni@gmail.com> Tue May 10 22:24:39 2016 +0000
tree 5e97323d8dbef836ac79f48c3f0f54532caf454e
parent 419c8bd1b0eb1aca803065e18614a722aa6bb6be

Explicitly return NO CONTENT type response for http DELETE request

Change-Id: I920084b92197bb1687e7d978ad350b2e1290ecbc

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 1fdb060..ec32b20 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
@@ -224,11 +224,12 @@
      *
      * @param deviceId device identifier
      * @param flowId   flow rule identifier
+     * @return 204 NO CONTENT
      */
     @DELETE
     @Produces(MediaType.APPLICATION_JSON)
     @Path("{deviceId}/{flowId}")
-    public void deleteFlowByDeviceIdAndFlowId(@PathParam("deviceId") String deviceId,
+    public Response deleteFlowByDeviceIdAndFlowId(@PathParam("deviceId") String deviceId,
                                               @PathParam("flowId") long flowId) {
         final Iterable<FlowEntry> flowEntries =
                 service.getFlowEntries(DeviceId.deviceId(deviceId));
@@ -240,16 +241,18 @@
         StreamSupport.stream(flowEntries.spliterator(), false)
                 .filter(entry -> entry.id().value() == flowId)
                 .forEach(service::removeFlowRules);
+        return Response.noContent().build();
     }
 
     /**
      * Removes a batch of flow rules.
      *
      * @param stream stream for posted JSON
+     * @return NO CONTENT
      */
     @DELETE
     @Produces(MediaType.APPLICATION_JSON)
-    public void deleteFlows(InputStream stream) {
+    public Response deleteFlows(InputStream stream) {
         ListMultimap<DeviceId, Long> deviceMap = ArrayListMultimap.create();
         List<FlowEntry> rulesToRemove = new ArrayList<>();
 
@@ -283,6 +286,7 @@
         });
 
         service.removeFlowRules(rulesToRemove.toArray(new FlowEntry[0]));
+        return Response.noContent().build();
     }
 
 }