Minor clean up, turn Part into an interface

Author: Stephane Landelle

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

@@ -12,7 +12,8 @@
  */
 package org.asynchttpclient.multipart;
 
-import org.asynchttpclient.util.StandardCharsets;
+import static org.asynchttpclient.util.StandardCharsets.US_ASCII;
+import static org.asynchttpclient.util.StandardCharsets.ISO_8859_1;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -32,7 +33,7 @@ public abstract class AbstractFilePart extends PartBase {
     /**
      * Default charset of file attachments.
      */
-    public static final String DEFAULT_CHARSET = StandardCharsets.ISO_8859_1.name();
+    public static final String DEFAULT_CHARSET = ISO_8859_1.name();
 
     /**
      * Default transfer encoding of file attachments.
@@ -42,10 +43,12 @@ public abstract class AbstractFilePart extends PartBase {
     /**
      * Attachment's file name as a byte array
      */
-    private static final byte[] FILE_NAME_BYTES = "; filename=".getBytes(StandardCharsets.US_ASCII);
+    private static final byte[] FILE_NAME_BYTES = "; filename=".getBytes(US_ASCII);
 
     private long stalledTime = -1L;
 
+    private String fileName;
+
     /**
      * FilePart Constructor.
      * 
@@ -64,27 +67,16 @@ public AbstractFilePart(String name, String contentType, String charset, String
                 DEFAULT_TRANSFER_ENCODING, contentId);
     }
 
-    public abstract String getFileName();
-
     protected void visitDispositionHeader(PartVisitor visitor) throws IOException {
         super.visitDispositionHeader(visitor);
-        String filename = getFileName();
-        if (filename != null) {
+        if (fileName != null) {
             visitor.withBytes(FILE_NAME_BYTES);
-            visitor.withBytes(QUOTE_BYTES);
-            visitor.withBytes(filename.getBytes(StandardCharsets.US_ASCII));
-            visitor.withBytes(QUOTE_BYTES);
+            visitor.withByte(QUOTE_BYTE);
+            visitor.withBytes(fileName.getBytes(US_ASCII));
+            visitor.withByte(QUOTE_BYTE);
         }
     }
 
-    public void setStalledTime(long ms) {
-        stalledTime = ms;
-    }
-
-    public long getStalledTime() {
-        return stalledTime;
-    }
-
     protected byte[] generateFileStart(byte[] boundary) throws IOException {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         OutputStreamPartVisitor visitor = new OutputStreamPartVisitor(out);
@@ -104,4 +96,28 @@ protected byte[] generateFileEnd() throws IOException {
         visitEnd(visitor);
         return out.toByteArray();
     }
+
+    public void setStalledTime(long ms) {
+        stalledTime = ms;
+    }
+
+    public long getStalledTime() {
+        return stalledTime;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    @Override
+    public String toString() {
+        return new StringBuilder()//
+                .append(super.toString())//
+                .append(" filename=").append(fileName)//
+                .toString();
+    }
 }

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

@@ -19,7 +19,6 @@
 public class ByteArrayPart extends AbstractFilePart {
 
     private final byte[] bytes;
-    private final String fileName;
 
     public ByteArrayPart(String name, byte[] bytes) {
         this(name, bytes, null);
@@ -43,12 +42,7 @@ public ByteArrayPart(String name, byte[] bytes, String contentType, String chars
             throw new NullPointerException("bytes");
         }
         this.bytes = bytes;
-        this.fileName = fileName;
-    }
-
-    @Override
-    public String getFileName() {
-        return fileName;
+        setFileName(fileName);
     }
 
     @Override

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

@@ -23,6 +23,11 @@ public void withBytes(byte[] bytes) throws IOException {
         count += bytes.length;
     }
 
+    @Override
+    public void withByte(byte b) throws IOException {
+        count++;
+    }
+
     public long getCount() {
         return count;
     }

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

@@ -29,7 +29,6 @@ public class FilePart extends AbstractFilePart {
     private static final Logger LOGGER = LoggerFactory.getLogger(FilePart.class);
 
     private final File file;
-    private final String fileName;
 
     public FilePart(String name, File file) {
         this(name, file, null, null);
@@ -59,12 +58,7 @@ public FilePart(String name, File file, String contentType, String charset, Stri
         if (!file.canRead()) {
             throw new IllegalArgumentException("File is not readable " + file.getAbsolutePath());
         }
-        this.fileName = fileName != null ? fileName : file.getName();
-    }
-
-    @Override
-    public String getFileName() {
-        return fileName;
+        setFileName(fileName != null ? fileName : file.getName());
     }
 
     @Override

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

@@ -31,6 +31,11 @@ public void withBytes(byte[] bytes) throws IOException {
         out.write(bytes);
     }
 
+    @Override
+    public void withByte(byte b) throws IOException {
+        out.write(b);
+    }
+
     public OutputStream getOutputStream() {
         return out;
     }