Port 6f60a45 on master

Author: Stephane Landelle

api/src/main/java/org/asynchttpclient/multipart/MultipartBody.java

@@ -78,7 +78,7 @@ public long read(ByteBuffer buffer) throws IOException {
         try {
             int overallLength = 0;
 
-            int maxLength = buffer.capacity();
+            int maxLength = buffer.remaining();
 
             if (startPart == parts.size() && endWritten) {
                 return overallLength;
@@ -132,6 +132,7 @@ public long read(ByteBuffer buffer) throws IOException {
                         initializeFileEnd(currentFilePart);
                     } else if (fileLocation == FileLocation.END) {
                         startPart++;
+                        fileLocation = FileLocation.NONE;
                         if (startPart == parts.size() && currentStream.available() == 0) {
                             doneWritingParts = true;
                         }
@@ -146,6 +147,7 @@ public long read(ByteBuffer buffer) throws IOException {
                         initializeFileEnd(currentFilePart);
                     } else if (fileLocation == FileLocation.END) {
                         startPart++;
+                        fileLocation = FileLocation.NONE;
                         if (startPart == parts.size() && currentStream.available() == 0) {
                             doneWritingParts = true;
                         }
@@ -165,6 +167,7 @@ public long read(ByteBuffer buffer) throws IOException {
                         initializeFileEnd(currentFilePart);
                     } else if (fileLocation == FileLocation.END) {
                         startPart++;
+                        fileLocation = FileLocation.NONE;
                         if (startPart == parts.size() && currentStream.available() == 0) {
                             doneWritingParts = true;
                         }
@@ -202,7 +205,8 @@ public long read(ByteBuffer buffer) throws IOException {
     private void initializeByteArrayBody(FilePart filePart)
             throws IOException {
 
-        ByteArrayOutputStream output = generateByteArrayBody(filePart);
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        filePart.sendData(output);
 
         initializeBuffer(output);
 
@@ -388,15 +392,9 @@ private StringPart generateClientStringpart(org.asynchttpclient.Part part) {
     private long handleByteArrayPart(WritableByteChannel target,
                                      FilePart filePart, byte[] data) throws IOException {
 
-        ByteArrayOutputStream output = generateByteArrayBody(filePart);
-        return writeToTarget(target, output);
-    }
-
-    private ByteArrayOutputStream generateByteArrayBody(FilePart filePart)
-            throws IOException {
         ByteArrayOutputStream output = new ByteArrayOutputStream();
         Part.sendPart(output, filePart, boundary);
-        return output;
+        return writeToTarget(target, output);
     }
 
     private long handleFileEnd(WritableByteChannel target, FilePart filePart)

api/src/test/java/org/asynchttpclient/multipart/MultipartBodyTest.java

@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2013 Sonatype, Inc. All rights reserved.
+ *
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
+ */
+package org.asynchttpclient.multipart;
+
+import org.asynchttpclient.*;
+import org.asynchttpclient.Part;
+import org.asynchttpclient.util.AsyncHttpProviderUtils;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+public class MultipartBodyTest {
+
+    @Test(groups = "fast")
+    public void testBasics() {
+        final List<Part> parts = new ArrayList<Part>();
+
+        // add a file
+        final File testFile = getTestfile();
+        try {
+            parts.add(new FilePart("filePart", testFile));
+        } catch (FileNotFoundException fne) {
+            Assert.fail("file not found: " + testFile);
+        }
+
+        // add a byte array
+        try {
+            parts.add(new ByteArrayPart("baPart", "fileName", "testMultiPart".getBytes("utf-8"), "application/test", "utf-8"));
+        } catch (UnsupportedEncodingException ignore) {
+        }
+
+        // add a string
+        parts.add(new StringPart("stringPart", "testString", "utf-8"));
+
+        compareContentLength(parts);
+    }
+
+    private static File getTestfile() {
+        final ClassLoader cl = MultipartBodyTest.class.getClassLoader();
+        final URL url = cl.getResource("textfile.txt");
+        Assert.assertNotNull(url);
+        File file = null;
+        try {
+            file = new File(url.toURI());
+        } catch (URISyntaxException use) {
+            Assert.fail("uri syntax error");
+        }
+        return file;
+    }
+
+    private static void compareContentLength(final List<Part> parts) {
+        Assert.assertNotNull(parts);
+        // get expected values
+        MultipartRequestEntity mre = null;
+        try {
+            mre = AsyncHttpProviderUtils.createMultipartRequestEntity(parts, new FluentCaseInsensitiveStringsMap());
+        } catch (FileNotFoundException fne) {
+            Assert.fail("file not found: " + parts);
+        }
+        final long expectedContentLength = mre.getContentLength();
+
+        // get real bytes
+        final Body multipartBody = new MultipartBody(parts, mre.getContentType(), String.valueOf(expectedContentLength));
+        try {
+            final ByteBuffer buffer = ByteBuffer.allocate(8192);
+            boolean last = false;
+            long totalBytes = 0;
+            while (!last) {
+                long readBytes = 0;
+                try {
+                    readBytes = multipartBody.read(buffer);
+                } catch (IOException ie) {
+                    Assert.fail("read failure");
+                }
+                if (readBytes >= 0) {
+                    totalBytes += readBytes;
+                } else {
+                    last = true;
+                }
+                buffer.clear();
+            }
+            Assert.assertEquals(totalBytes, expectedContentLength);
+        } finally {
+            try {
+                multipartBody.close();
+            } catch (IOException ignore) {
+            }
+        }
+    }
+}