Get rid of code duplication for computing length and sending parts

Author: Stephane Landelle

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

@@ -16,7 +16,6 @@
 package org.asynchttpclient.multipart;
 
 import java.io.IOException;
-import java.io.OutputStream;
 
 import org.asynchttpclient.util.StandardCharsets;
 
@@ -42,15 +41,10 @@ public abstract class AbstractFilePart extends PartBase {
      */
     public static final String DEFAULT_TRANSFER_ENCODING = "binary";
 
-    /**
-     * Attachment's file name
-     */
-    protected static final String FILE_NAME = "; filename=";
-
     /**
      * Attachment's file name as a byte array
      */
-    private static final byte[] FILE_NAME_BYTES = FILE_NAME.getBytes(StandardCharsets.US_ASCII);
+    private static final byte[] FILE_NAME_BYTES = "; filename=".getBytes(StandardCharsets.US_ASCII);
 
     private long stalledTime = -1L;
 
@@ -73,35 +67,15 @@ public AbstractFilePart(String name, String contentType, String charset, String
 
     public abstract String getFileName();
 
-    /**
-     * Write the disposition header to the output stream
-     * 
-     * @param out
-     *            The output stream
-     * @throws java.io.IOException
-     *             If an IO problem occurs
-     */
-    protected void sendDispositionHeader(OutputStream out) throws IOException {
-        super.sendDispositionHeader(out);
+    protected void visitDispositionHeader(PartVisitor visitor) throws IOException {
+        super.visitDispositionHeader(visitor);
         String filename = getFileName();
         if (filename != null) {
-            out.write(FILE_NAME_BYTES);
-            out.write(QUOTE_BYTES);
-            out.write(filename.getBytes(StandardCharsets.US_ASCII));
-            out.write(QUOTE_BYTES);
-        }
-    }
-
-    protected long dispositionHeaderLength() {
-        String filename = this.getFileName();
-        long length = super.dispositionHeaderLength();
-        if (filename != null) {
-            length += FILE_NAME_BYTES.length;
-            length += QUOTE_BYTES.length;
-            length += filename.getBytes(StandardCharsets.US_ASCII).length;
-            length += QUOTE_BYTES.length;
+            visitor.withBytes(FILE_NAME_BYTES);
+            visitor.withBytes(QUOTE_BYTES);
+            visitor.withBytes(filename.getBytes(StandardCharsets.US_ASCII));
+            visitor.withBytes(QUOTE_BYTES);
         }
-        return length;
     }
 
     public void setStalledTime(long ms) {

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

@@ -59,7 +59,7 @@ protected void sendData(OutputStream out) throws IOException {
     }
 
     @Override
-    protected long lengthOfData() {
+    protected long getDataLength() {
         return bytes.length;
     }
 

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

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2010 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.asynchttpclient.multipart;
+
+import java.io.IOException;
+
+public class CounterPartVisitor implements PartVisitor {
+
+    private long count = 0L;
+    
+    @Override
+    public void withBytes(byte[] bytes) throws IOException {
+        count += bytes.length;
+    }
+    
+    public long getCount() {
+        return count;
+    }
+}

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

@@ -64,7 +64,7 @@ public String getFileName() {
 
     @Override
     protected void sendData(OutputStream out) throws IOException {
-        if (lengthOfData() == 0) {
+        if (getDataLength() == 0) {
 
             // this file contains no data, so there is nothing to send.
             // we don't want to create a zero length buffer as this will
@@ -86,7 +86,7 @@ protected void sendData(OutputStream out) throws IOException {
     }
 
     @Override
-    protected long lengthOfData() {
+    protected long getDataLength() {
         return file.length();
     }
 

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

@@ -264,9 +264,10 @@ private long handleFileEnd(WritableByteChannel target, AbstractFilePart filePart
     }
 
     private ByteArrayOutputStream generateFileEnd(AbstractFilePart filePart) throws IOException {
-        ByteArrayOutputStream endOverhead = new ByteArrayOutputStream();
-        filePart.sendEnd(endOverhead);
-        return endOverhead;
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        OutputStreamPartVisitor visitor = new OutputStreamPartVisitor(out);
+        filePart.visitEnd(visitor);
+        return out;
     }
 
     private long handleFileHeaders(WritableByteChannel target, AbstractFilePart filePart) throws IOException {
@@ -275,15 +276,16 @@ private long handleFileHeaders(WritableByteChannel target, AbstractFilePart file
     }
 
     private ByteArrayOutputStream generateFileStart(AbstractFilePart filePart) throws IOException {
-        ByteArrayOutputStream overhead = new ByteArrayOutputStream();
-
-        filePart.sendStart(overhead, boundary);
-        filePart.sendDispositionHeader(overhead);
-        filePart.sendContentTypeHeader(overhead);
-        filePart.sendTransferEncodingHeader(overhead);
-        filePart.sendContentIdHeader(overhead);
-        filePart.sendEndOfHeader(overhead);
-        return overhead;
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        OutputStreamPartVisitor visitor = new OutputStreamPartVisitor(out);
+        filePart.visitStart(visitor, boundary);
+        filePart.visitDispositionHeader(visitor);
+        filePart.visitContentTypeHeader(visitor);
+        filePart.visitTransferEncodingHeader(visitor);
+        filePart.visitContentIdHeader(visitor);
+        filePart.visitEndOfHeader(visitor);
+
+        return out;
     }
 
     private long handleFilePart(WritableByteChannel target, FilePart filePart) throws IOException {

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.asynchttpclient.multipart;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class OutputStreamPartVisitor implements PartVisitor {
+
+    private final OutputStream out;
+    
+    public OutputStreamPartVisitor(OutputStream out) {
+        this.out = out;
+    }
+    
+    @Override
+    public void withBytes(byte[] bytes) throws IOException{
+        out.write(bytes);
+    }
+    
+    public OutputStream getOutputStream() {
+        return out;
+    }
+}