Minor clean up

Author: Stephane Landelle

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

@@ -44,7 +44,7 @@ public abstract class Part {
      * form-data as a byte array
      */
     public static final byte[] FORM_DATA_DISPOSITION_TYPE_BYTES = "form-data".getBytes(StandardCharsets.US_ASCII);
-    
+
     /**
      * name as a byte array
      */
@@ -105,6 +105,13 @@ public abstract class Part {
      */
     public abstract String getContentId();
 
+    /**
+     * Gets the disposition-type to be used in Content-Disposition header
+     * 
+     * @return the disposition-type
+     */
+    public abstract String getDispositionType();
+
     /**
      * Tests if this part can be sent more than once.
      * 
@@ -115,30 +122,18 @@ public boolean isRepeatable() {
         return true;
     }
 
-    private String dispositionType;
-    /**
-     * Gets the disposition-type to be used in Content-Disposition header
-     * 
-     * @return the disposition-type
-     */
-    public String getDispositionType() {
-        return dispositionType;
-    }
-
-    public void setDispositionType(String dispositionType) {
-        this.dispositionType = dispositionType;
-    }
-
     protected void visitStart(PartVisitor visitor, byte[] boundary) throws IOException {
         visitor.withBytes(EXTRA_BYTES);
         visitor.withBytes(boundary);
     }
 
     protected void visitDispositionHeader(PartVisitor visitor) throws IOException {
+
         if (getName() != null) {
             visitor.withBytes(CRLF_BYTES);
             visitor.withBytes(CONTENT_DISPOSITION_BYTES);
-            visitor.withBytes(dispositionType != null? dispositionType.getBytes(StandardCharsets.US_ASCII): FORM_DATA_DISPOSITION_TYPE_BYTES);
+            visitor.withBytes(getDispositionType() != null ? getDispositionType().getBytes(StandardCharsets.US_ASCII)
+                    : FORM_DATA_DISPOSITION_TYPE_BYTES);
             visitor.withBytes(NAME_BYTES);
             visitor.withBytes(QUOTE_BYTES);
             visitor.withBytes(getName().getBytes(StandardCharsets.US_ASCII));

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

@@ -15,27 +15,35 @@
 public abstract class PartBase extends Part {
 
     /**
-     * Name of the file part.
+     * The name of the form field, part of the Content-Disposition header
      */
     private final String name;
 
     /**
-     * Content type of the file part.
+     * The main part of the Content-Type header
      */
     private final String contentType;
 
     /**
-     * Content encoding of the file part.
+     * The charset (part of Content-Type header)
      */
     private final String charSet;
 
     /**
-     * The transfer encoding.
+     * The Content-Transfer-Encoding header value.
      */
     private final String transferEncoding;
 
+    /**
+     * The Content-Id
+     */
     private final String contentId;
 
+    /**
+     * The disposition type (part of Content-Disposition)
+     */
+    private String dispositionType;
+
     /**
      * Constructor.
      * 
@@ -57,43 +65,37 @@ public PartBase(String name, String contentType, String charSet, String transfer
         this.contentId = contentId;
     }
 
-    /**
-     * Returns the name.
-     * 
-     * @return The name.
-     */
+    @Override
     public String getName() {
         return this.name;
     }
 
-    /**
-     * Returns the content type of this part.
-     * 
-     * @return String The name.
-     */
+    @Override
     public String getContentType() {
         return this.contentType;
     }
 
-    /**
-     * Return the character encoding of this part.
-     * 
-     * @return String The name.
-     */
+    @Override
     public String getCharSet() {
         return this.charSet;
     }
 
-    /**
-     * Returns the transfer encoding of this part.
-     * 
-     * @return String The name.
-     */
+    @Override
     public String getTransferEncoding() {
         return transferEncoding;
     }
 
+    @Override
     public String getContentId() {
         return contentId;
     }
+
+    @Override
+    public String getDispositionType() {
+        return dispositionType;
+    }
+
+    public void setDispositionType(String dispositionType) {
+        this.dispositionType = dispositionType;
+    }
 }