Drop InputStreamBodyGenerator marking strategy, close AsyncHttpClient#760

Author: Stephane Landelle

src/main/java/com/ning/http/client/generators/InputStreamBodyGenerator.java

@@ -40,12 +40,6 @@ public class InputStreamBodyGenerator implements BodyGenerator {
 
     public InputStreamBodyGenerator(InputStream inputStream) {
         this.inputStream = inputStream;
-
-        if (inputStream.markSupported()) {
-            inputStream.mark(0);
-        } else {
-            logger.info("inputStream.markSupported() not supported. Some features will not work.");
-        }
     }
 
     public InputStream getInputStream() {
@@ -97,12 +91,8 @@ public long read(ByteBuffer buffer) throws IOException {
 
                         buffer.put(END_PADDING);
 
-
                         return buffer.position();
                     } else {
-                        if (inputStream.markSupported()) {
-                            inputStream.reset();
-                        }
                         eof = false;
                     }
                     return -1;
@@ -118,14 +108,8 @@ public long read(ByteBuffer buffer) throws IOException {
                 buffer.put(chunk, 0, read);
                 // Was missing the final chunk \r\n.
                 buffer.put(END_PADDING);
-            } else {
-                if (read > 0) {
-                    buffer.put(chunk, 0, read);
-                } else {
-                    if (inputStream.markSupported()) {
-                        inputStream.reset();
-                    }
-                }
+            } else if (read > 0) {
+                buffer.put(chunk, 0, read);
             }
             return read;
         }

src/test/java/com/ning/http/client/async/ChunkingTest.java

@@ -18,13 +18,16 @@
 import com.ning.http.client.RequestBuilder;
 import com.ning.http.client.Response;
 import com.ning.http.client.generators.InputStreamBodyGenerator;
+
 import org.testng.annotations.Test;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.io.InputStream;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Random;
 
@@ -67,11 +70,21 @@ abstract public class ChunkingTest extends AbstractBasicTest {
      * Tests that the custom chunked stream result in success and content returned that is unchunked
      */
     @Test()
-    public void testCustomChunking() throws Throwable {
-        doTest(true);
+    public void testBufferLargerThanFile() throws Throwable {
+        doTest(new BufferedInputStream(new FileInputStream(getTestFile()), 400000));
     }
 
-    private void doTest(boolean customChunkedInputStream) throws Exception {
+    @Test()
+    public void testBufferSmallThanFile() throws Throwable {
+        doTest(new BufferedInputStream(new FileInputStream(getTestFile())));
+    }
+
+    @Test()
+    public void testDirectFile() throws Throwable {
+        doTest(new FileInputStream(getTestFile()));
+    }
+
+    public void doTest(InputStream is) throws Throwable {
         AsyncHttpClientConfig.Builder bc = new AsyncHttpClientConfig.Builder()//
                 .setAllowPoolingConnections(true)//
                 .setMaxConnectionsPerHost(1)//
@@ -84,44 +97,27 @@ private void doTest(boolean customChunkedInputStream) throws Exception {
         try {
             RequestBuilder builder = new RequestBuilder("POST");
             builder.setUrl(getTargetUrl());
-            if (customChunkedInputStream) {
-                // made buff in stream big enough to mark.
-                builder.setBody(new InputStreamBodyGenerator(new BufferedInputStream(new FileInputStream(getTestFile()), 400000)));
+            // made buff in stream big enough to mark.
+            builder.setBody(new InputStreamBodyGenerator(is));
+
+            ListenableFuture<Response> response = client.executeRequest(builder.build());
+            Response res = response.get();
+            assertNotNull(res.getResponseBodyAsStream());
+            if (500 == res.getStatusCode()) {
+                assertEquals(res.getStatusCode(), 500, "Should have 500 status code");
+                assertTrue(res.getHeader("X-Exception").contains("invalid.chunk.length"), "Should have failed due to chunking");
+                fail("HARD Failing the test due to provided InputStreamBodyGenerator, chunking incorrectly:" + res.getHeader("X-Exception"));
             } else {
-                // made buff in stream big enough to mark.
-                builder.setBody(new InputStreamBodyGenerator(new BufferedInputStream(new FileInputStream(getTestFile()), 400000)));
-            }
-            com.ning.http.client.Request r = builder.build();
-            Response res = null;
-
-            try {
-                ListenableFuture<Response> response = client.executeRequest(r);
-                res = response.get();
-                assertNotNull(res.getResponseBodyAsStream());
-                if (500 == res.getStatusCode()) {
-                    System.out.println("==============");
-                    System.out.println("500 response from call");
-                    System.out.println("Headers:" + res.getHeaders());
-                    System.out.println("==============");
-                    System.out.flush();
-                    assertEquals(res.getStatusCode(), 500, "Should have 500 status code");
-                    assertTrue(res.getHeader("X-Exception").contains("invalid.chunk.length"), "Should have failed due to chunking");
-                    fail("HARD Failing the test due to provided InputStreamBodyGenerator, chunking incorrectly:" + res.getHeader("X-Exception"));
-                } else {
-                    assertEquals(readInputStreamToBytes(res.getResponseBodyAsStream()), LARGE_IMAGE_BYTES);
-                }
-            } catch (Exception e) {
-
-                fail("Exception Thrown:" + e.getMessage());
+                assertEquals(readInputStreamToBytes(res.getResponseBodyAsStream()), LARGE_IMAGE_BYTES);
             }
         } finally {
             if (client != null)
                 client.close();
         }
     }
-
-    private byte[] readInputStreamToBytes(InputStream stream) {
-        byte[] data = new byte[0];
+    
+    
+    private byte[] readInputStreamToBytes(InputStream stream) throws IOException {
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
         try {
             int nRead;
@@ -130,32 +126,21 @@ private byte[] readInputStreamToBytes(InputStream stream) {
             while ((nRead = stream.read(tmp, 0, tmp.length)) != -1) {
                 buffer.write(tmp, 0, nRead);
             }
+
             buffer.flush();
-            data = buffer.toByteArray();
-        } catch (Exception e) {
+            return buffer.toByteArray();
 
         } finally {
             try {
                 stream.close();
             } catch (Exception e2) {
             }
-            return data;
         }
     }
 
-    private static File getTestFile() {
+    private static File getTestFile() throws URISyntaxException {
         String testResource1 = "300k.png";
-
-        File testResource1File = null;
-        try {
-            ClassLoader cl = ChunkingTest.class.getClassLoader();
-            URL url = cl.getResource(testResource1);
-            testResource1File = new File(url.toURI());
-        } catch (Throwable e) {
-            // TODO Auto-generated catch block
-            fail("unable to find " + testResource1);
-        }
-
-        return testResource1File;
+        URL url = ChunkingTest.class.getClassLoader().getResource(testResource1);
+        return new File(url.toURI());
     }
 }