Merge pull request #755 from VinnyQ/empty_array_ingest_payload_should…

…_error change response to BAD_REQUEST for empty aggregated metrics request
rax-maas · Nov 23, 2016 · 619bf30 · 619bf30
2 parents 3a8c7ee + 56e33eb
commit 619bf30
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ava/com/rackspacecloud/blueflood/inputs/handlers/HttpAggregatedMultiIngestionHandler.java b/...ava/com/rackspacecloud/blueflood/inputs/handlers/HttpAggregatedMultiIngestionHandler.java
@@ -134,7 +134,7 @@ public void handle(ChannelHandlerContext ctx, FullHttpRequest request) {
 
             } else {
                 // no aggregated metric bundles in body, response OK
-                DefaultHandler.sendResponse(ctx, request, null, HttpResponseStatus.OK);
+                DefaultHandler.sendResponse(ctx, request, "No valid metrics", HttpResponseStatus.BAD_REQUEST);
                 return;
             }
         } catch (JsonParseException ex) {

diff --git a/...com/rackspacecloud/blueflood/inputs/handlers/HttpAggregatedMultiIngestionHandlerTest.java b/...com/rackspacecloud/blueflood/inputs/handlers/HttpAggregatedMultiIngestionHandlerTest.java
@@ -210,8 +210,8 @@ public void testEmptyArrayJsonRequest() throws IOException {
 
         String responseBody = argument.getValue().content().toString(Charset.defaultCharset());
 
-        assertEquals("Invalid response", "", responseBody);
-        assertEquals("Invalid status", HttpResponseStatus.OK, argument.getValue().getStatus());
+        assertEquals("Invalid response", "No valid metrics", responseBody);
+        assertEquals("Invalid status", HttpResponseStatus.BAD_REQUEST, argument.getValue().getStatus());
     }
 
     private String createRequestBody(String tenantId, long collectionTime, long flushInterval, BluefloodGauge[] gauges,