Make disposition-type configurable, close #522

Author: Stephane Landelle

src/main/java/com/ning/http/multipart/Part.java

@@ -33,82 +33,102 @@ public abstract class Part implements com.ning.http.client.Part {
     /**
      * Carriage return/linefeed
      */
-    protected static final String CRLF = "\r\n";
+    public static final String CRLF = "\r\n";
 
     /**
      * Carriage return/linefeed as a byte array
      */
-    static final byte[] CRLF_BYTES = MultipartEncodingUtil.getAsciiBytes(CRLF);
+    public static final byte[] CRLF_BYTES = MultipartEncodingUtil.getAsciiBytes(CRLF);
 
     /**
      * Content dispostion characters
      */
-    protected static final String QUOTE = "\"";
+    public static final String QUOTE = "\"";
 
     /**
      * Content dispostion as a byte array
      */
-    static final byte[] QUOTE_BYTES = MultipartEncodingUtil.getAsciiBytes(QUOTE);
+    public static final byte[] QUOTE_BYTES = MultipartEncodingUtil.getAsciiBytes(QUOTE);
 
     /**
      * Extra characters
      */
-    protected static final String EXTRA = "--";
+    public static final String EXTRA = "--";
 
     /**
      * Extra characters as a byte array
      */
-    static final byte[] EXTRA_BYTES = MultipartEncodingUtil.getAsciiBytes(EXTRA);
+    public static final byte[] EXTRA_BYTES = MultipartEncodingUtil.getAsciiBytes(EXTRA);
 
     /**
-     * Content dispostion characters
+     * Content disposition characters
      */
-    protected static final String CONTENT_DISPOSITION = "Content-Disposition: form-data; name=";
+    public static final String CONTENT_DISPOSITION = "Content-Disposition: ";
 
     /**
-     * Content dispostion as a byte array
+     * Content disposition as a byte array
+     */
+    public static final byte[] CONTENT_DISPOSITION_BYTES = MultipartEncodingUtil.getAsciiBytes(CONTENT_DISPOSITION);
+    
+    /**
+     * form-data characters
+     */
+    public static final String FORM_DATA_DISPOSITION_TYPE = "form-data";
+
+    /**
+     * form-data as a byte array
+     */
+    public static final byte[] FORM_DATA_DISPOSITION_TYPE_BYTES = MultipartEncodingUtil.getAsciiBytes(FORM_DATA_DISPOSITION_TYPE);
+    
+    /**
+     * name characters
      */
-    static final byte[] CONTENT_DISPOSITION_BYTES = MultipartEncodingUtil.getAsciiBytes(CONTENT_DISPOSITION);
+    public static final String NAME = "; name=";
+
+    /**
+     * name as a byte array
+     */
+    public static final byte[] NAME_BYTES = MultipartEncodingUtil.getAsciiBytes(NAME);
 
     /**
      * Content type header
      */
-    protected static final String CONTENT_TYPE = "Content-Type: ";
+    public static final String CONTENT_TYPE = "Content-Type: ";
 
     /**
      * Content type header as a byte array
      */
-    static final byte[] CONTENT_TYPE_BYTES = MultipartEncodingUtil.getAsciiBytes(CONTENT_TYPE);
+    public static final byte[] CONTENT_TYPE_BYTES = MultipartEncodingUtil.getAsciiBytes(CONTENT_TYPE);
 
     /**
      * Content charset
      */
-    protected static final String CHARSET = "; charset=";
+    public static final String CHARSET = "; charset=";
 
     /**
      * Content charset as a byte array
      */
-    static final byte[] CHARSET_BYTES = MultipartEncodingUtil.getAsciiBytes(CHARSET);
+    public static final byte[] CHARSET_BYTES = MultipartEncodingUtil.getAsciiBytes(CHARSET);
 
     /**
      * Content type header
      */
-    protected static final String CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding: ";
+    public static final String CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding: ";
 
     /**
      * Content type header as a byte array
      */
-    static final byte[] CONTENT_TRANSFER_ENCODING_BYTES = MultipartEncodingUtil.getAsciiBytes(CONTENT_TRANSFER_ENCODING);
+    public static final byte[] CONTENT_TRANSFER_ENCODING_BYTES = MultipartEncodingUtil.getAsciiBytes(CONTENT_TRANSFER_ENCODING);
 
     /**
      * Content type header
      */
-    protected static final String CONTENT_ID = "Content-ID: ";
+    public static final String CONTENT_ID = "Content-ID: ";
 
     /**
      * Content type header as a byte array
      */
-    static final byte[] CONTENT_ID_BYTES = MultipartEncodingUtil.getAsciiBytes(CONTENT_ID);
+    public static final byte[] CONTENT_ID_BYTES = MultipartEncodingUtil.getAsciiBytes(CONTENT_ID);
 
     /**
      * Return the name of this part.
@@ -155,6 +175,20 @@ 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;
+    }
+
     /**
      * Write the start to the specified output stream
      * 
@@ -181,6 +215,11 @@ protected void sendDispositionHeader(OutputStream out) throws IOException {
         if (getName() != null) {
             out.write(CRLF_BYTES);
             out.write(CONTENT_DISPOSITION_BYTES);
+            if (dispositionType != null)
+                out.write(MultipartEncodingUtil.getAsciiBytes(dispositionType));
+            else
+                out.write(FORM_DATA_DISPOSITION_TYPE_BYTES);
+            out.write(NAME_BYTES);
             out.write(QUOTE_BYTES);
             out.write(MultipartEncodingUtil.getAsciiBytes(getName()));
             out.write(QUOTE_BYTES);
@@ -192,6 +231,11 @@ protected long dispositionHeaderLength() {
         if (getName() != null) {
             length += CRLF_BYTES.length;
             length += CONTENT_DISPOSITION_BYTES.length;
+            if (dispositionType != null)
+                length += MultipartEncodingUtil.getAsciiBytes(dispositionType).length;
+            else
+                length += FORM_DATA_DISPOSITION_TYPE_BYTES.length;
+            length += NAME_BYTES.length;
             length += QUOTE_BYTES.length;
             length += MultipartEncodingUtil.getAsciiBytes(getName()).length;
             length += QUOTE_BYTES.length;