Merge pull request #17 from Nosto/remove-consumable-check

Remove consumable check
Nosto · Apr 27, 2016 · bfc2f86 · bfc2f86
2 parents 22ccc7c + 1de7fb2
commit bfc2f86
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 42 deletions.
diff --git a/framework/src/play/libs/WS.java b/framework/src/play/libs/WS.java
@@ -756,5 +756,6 @@ public JsonElement getJson() {
             }
         }
 
+        public abstract byte[] getBytes();
     }
 }
diff --git a/framework/src/play/libs/ws/WSAsync.java b/framework/src/play/libs/ws/WSAsync.java
@@ -1,10 +1,5 @@
 package play.libs.ws;
 
-import javax.net.ssl.SSLContext;
-
-import org.w3c.dom.Document;
-import org.apache.commons.lang.NotImplementedException;
-
 import com.ning.http.client.*;
 import com.ning.http.client.AsyncHttpClient.BoundRequestBuilder;
 import com.ning.http.client.AsyncHttpClientConfig.Builder;
@@ -616,8 +611,6 @@ public static class HttpAsyncResponse extends HttpResponse {
 
         private Response response;
 
-        private boolean consumed;
-
         /**
          * you shouldnt have to create an HttpResponse yourself
          * 
@@ -662,67 +655,52 @@ public List<Header> getHeaders() {
             return result;
         }
 
-        /**
-         * get the response as a stream
-         * 
-         * @return an inputstream
-         */
         @Override
-        public InputStream getStream() {
-            checkConsumed();
+        public String getString() {
             try {
-                return response.getResponseBodyAsStream();
-            } catch (IllegalStateException e) {
-                return new ByteArrayInputStream(new byte[] {}); // Workaround
-                                                                // AHC's bug on
-                                                                // empty
-                                                                // responses
+                return response.getResponseBody(getEncoding());
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
         }
 
         @Override
-        public Document getXml(String encoding) {
+        public String getString(String encoding) {
             try {
-                checkConsumed();
-                return super.getXml(encoding);
-            } finally {
-                consumed = true;
+                return response.getResponseBody(encoding);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
             }
         }
 
         @Override
-        public String getString() {
+        public byte[] getBytes() {
             try {
-                checkConsumed();
-                return response.getResponseBody();
+                return response.getResponseBodyAsBytes();
             } catch (Exception e) {
                 throw new RuntimeException(e);
-            } finally {
-                consumed = true;
             }
         }
 
+        /**
+         * get the response as a stream
+         * 
+         * @return an inputstream
+         */
         @Override
-        public String getString(String encoding) {
+        public InputStream getStream() {
             try {
-                checkConsumed();
-                return response.getResponseBody(encoding);
+                return response.getResponseBodyAsStream();
+            } catch (IllegalStateException e) {
+                return new ByteArrayInputStream(new byte[] {}); // Workaround
+                                                                // AHC's bug on
+                                                                // empty
+                                                                // responses
             } catch (Exception e) {
                 throw new RuntimeException(e);
-            } finally {
-                consumed = true;
             }
         }
 
-        private void checkConsumed() {
-            if (consumed) {
-                throw new IllegalStateException("Stream already consumed");
-            }
-        }
-
-
     }
 
     private static class WSOAuthConsumer extends AbstractOAuthConsumer {

diff --git a/framework/src/play/libs/ws/WSUrlFetch.java b/framework/src/play/libs/ws/WSUrlFetch.java
@@ -382,6 +382,11 @@ public String getString(String encoding) {
             }
         }
 
+        @Override
+        public byte[] getBytes() {
+            return body.getBytes();
+        }
+
         /**
          * get the response as a stream
          * 

diff --git a/framework/test-src/play/libs/TestHttpResponse.java b/framework/test-src/play/libs/TestHttpResponse.java
@@ -62,4 +62,9 @@ public InputStream getStream() {
         return null;
     }
 
+    @Override
+    public byte[] getBytes() {
+        return this.queryContent.getBytes();
+    }
+
 }