Return JSON from post and put endpoints

Author: gaul

src/main/java/org/gaul/httpbin/HttpBinHandler.java

@@ -103,14 +103,21 @@ public void handle(String target, Request baseRequest,
                 respondJSON(servletResponse, os, response);
                 baseRequest.setHandled(true);
                 return;
-            } else if (method.equals("POST") && uri.equals("/post")) {
-                Utils.copy(is, os);
-                servletResponse.setStatus(HttpServletResponse.SC_OK);
-                baseRequest.setHandled(true);
-                return;
-            } else if (method.equals("PUT") && uri.equals("/put")) {
-                Utils.copy(is, os);
-                servletResponse.setStatus(HttpServletResponse.SC_OK);
+            } else if ((method.equals("POST") && uri.equals("/post")) ||
+                    (method.equals("PUT") && uri.equals("/put"))) {
+                JSONObject response = new JSONObject();
+
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                Utils.copy(is, baos);
+                response.put("data", new JSONObject(new String(
+                        baos.toByteArray(), StandardCharsets.UTF_8)));
+
+                response.put("args", mapParametersToJSON(request));
+                response.put("headers", mapHeadersToJSON(request));
+                response.put("origin", request.getRemoteAddr());
+                response.put("url", getFullURL(request));
+
+                respondJSON(servletResponse, os, response);
                 baseRequest.setHandled(true);
                 return;
             } else if (uri.equals("/redirect-to")) {

src/test/java/org/gaul/httpbin/HttpBinTest.java

@@ -20,11 +20,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.net.URI;
-import java.util.Random;
 
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.api.ContentResponse;
-import org.eclipse.jetty.client.util.BytesContentProvider;
+import org.eclipse.jetty.client.util.StringContentProvider;
+import org.json.JSONObject;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -68,24 +68,24 @@ public void tearDown() throws Exception {
 
     @Test
     public void testPostData() throws Exception {
-        byte[] input = new byte[1024];
-        new Random().nextBytes(input);
+        String input = "{\"foo\": 42}";
         ContentResponse response = client.POST(httpBinEndpoint + "/post")
-                .content(new BytesContentProvider(input))
+                .content(new StringContentProvider(input))
                 .send();
         assertThat(response.getStatus()).as("status").isEqualTo(200);
-        assertThat(response.getContent()).isEqualTo(input);
+        JSONObject object = new JSONObject(response.getContentAsString());
+        assertThat(object.getJSONObject("data").getInt("foo")).isEqualTo(42);
     }
 
     @Test
     public void testPutData() throws Exception {
-        byte[] input = new byte[1024];
-        new Random().nextBytes(input);
+        String input = "{\"foo\": 42}";
         ContentResponse response = client.newRequest(httpBinEndpoint + "/put")
                 .method("PUT")
-                .content(new BytesContentProvider(input))
+                .content(new StringContentProvider(input))
                 .send();
         assertThat(response.getStatus()).as("status").isEqualTo(200);
-        assertThat(response.getContent()).isEqualTo(input);
+        JSONObject object = new JSONObject(response.getContentAsString());
+        assertThat(object.getJSONObject("data").getInt("foo")).isEqualTo(42);
     }
 }