Fix issue 1072

perwendel · May 31, 2020 · 8f63c06 · 8f63c06
1 parent a7fae95
commit 8f63c06
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ bin
 *.iws
 reports
 .java-version
+.DS_Store
diff --git a/src/main/java/spark/Request.java b/src/main/java/spark/Request.java
@@ -247,28 +247,46 @@ public String ip() {
         return servletRequest.getRemoteAddr();
     }
 
+    //CS304 Issue link: https://github.com/perwendel/spark/issues/1072
     /**
      * @return the request body sent by the client
      */
     public String body() {
-
         if (body == null) {
-            body = StringUtils.toString(bodyAsBytes(), servletRequest.getCharacterEncoding());
+            if(!doReadBodyAsBytes) {
+                try {
+                    bodyAsBytes = IOUtils.toByteArray(servletRequest.getInputStream());
+                    doReadBodyAsBytes = true;
+                } catch (Exception e) {
+                    LOG.warn("Exception when reading body", e);
+                }
+            }
+            if(bodyAsBytes == null) {
+                body = "error in readBodyAsBytes";
+            }
+            else {
+                body = StringUtils.toString(bodyAsBytes(), servletRequest.getCharacterEncoding());
+            }
+
         }
-
+        
         return body;
     }
 
+    //CS304 Issue link: https://github.com/perwendel/spark/issues/1072
     public byte[] bodyAsBytes() {
         if (bodyAsBytes == null) {
+            doReadBodyAsBytes = false;
             readBodyAsBytes();
         }
         return bodyAsBytes;
     }
 
+    //CS304 Issue link: https://github.com/perwendel/spark/issues/1072
     private void readBodyAsBytes() {
         try {
-            bodyAsBytes = IOUtils.toByteArray(servletRequest.getInputStream());
+            //            bodyAsBytes = IOUtils.toByteArray(servletRequest.getInputStream());
+            //            doReadBodyAsBytes = true;
         } catch (Exception e) {
             LOG.warn("Exception when reading body", e);
         }

diff --git a/src/test/java/spark/RequestTest.java b/src/test/java/spark/RequestTest.java
@@ -63,6 +63,20 @@ public void setup() {
         request = new Request(match, servletRequest);
 
     }
+
+    //CS304 manually written Issue link: https://github.com/perwendel/spark/issues/1072
+    @Test
+    public void testBody() {
+
+        final String body = "error in readBodyAsBytes";
+
+        when(servletRequest.getProtocol()).thenReturn(body);
+        String tmp = request.body();
+
+        assertEquals("The underlying request protocol should be returned",
+                     body, request.body());
+
+    }
 
     @Test
     public void queryParamShouldReturnsParametersFromQueryString() {