Merge pull request #6 from piotrkot/320-multipart-filename

jcabi#320 - Adding optional arguments for formParam
piotrkot · Jun 25, 2022 · 1944dc4 · 1944dc4
2 parents 73067cc + 349ed8f
commit 1944dc4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -16,12 +16,10 @@ install:
   - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
   - cmd: mvn --version
   - cmd: java -version
-  - cmd: ruby --version
-  - cmd: gem install xcop
 build_script:
-  - mvn --batch-mode -Dmaven.test.skip=true clean package 
+  - mvn --batch-mode -Dmaven.test.skip=true clean package
 test_script:
-  - mvn --batch-mode -Pqulice clean install 
+  - mvn --batch-mode -Pqulice clean install
 cache:
   - C:\maven\
   - C:\Users\appveyor\.m2
diff --git a/src/main/java/com/jcabi/http/RequestBody.java b/src/main/java/com/jcabi/http/RequestBody.java
@@ -96,9 +96,10 @@ public interface RequestBody {
      * Add form param.
      * @param name Query param name
      * @param value Value of the query param to set
+     * @param opt Optional values of the query param to set
      * @return New alternated body
      */
-    RequestBody formParam(String name, Object value);
+    RequestBody formParam(String name, Object value, Object... opt);
 
     /**
      * Add form params.

diff --git a/src/main/java/com/jcabi/http/request/BaseRequest.java b/src/main/java/com/jcabi/http/request/BaseRequest.java
@@ -626,7 +626,8 @@ public RequestBody set(final byte[] txt) {
         }
 
         @Override
-        public RequestBody formParam(final String name, final Object value) {
+        public RequestBody formParam(final String name, final Object value,
+            final Object... opt) {
             final String boundary = this.boundary();
             final String dashes = "--";
             final byte[] last = Arrays.copyOfRange(
@@ -647,11 +648,17 @@ public RequestBody formParam(final String name, final Object value) {
             } else {
                 bytes = value.toString().getBytes(BaseRequest.CHARSET);
             }
+            final String filename;
+            if (opt.length == 0) {
+                filename = "binary";
+            } else {
+                filename = (String) opt[0];
+            }
             final byte[] disposition = Joiner.on("; ")
                 .join(
                     "Content-Disposition: form-data",
                     String.format("name=\"%s\"", name),
-                    "filename=\"binary\""
+                    String.format("filename=\"%s\"", filename)
                 ).getBytes(BaseRequest.CHARSET);
             final byte[] type = "Content-Type: application/octet-stream"
                 .getBytes(BaseRequest.CHARSET);
@@ -773,7 +780,8 @@ public RequestBody set(final byte[] txt) {
         }
 
         @Override
-        public RequestBody formParam(final String name, final Object value) {
+        public RequestBody formParam(final String name, final Object value,
+            final Object... opt) {
             try {
                 final StringBuilder builder = new StringBuilder(this.get());
                 if (!builder.toString().isEmpty()) {

diff --git a/src/test/java/com/jcabi/http/RequestTest.java b/src/test/java/com/jcabi/http/RequestTest.java
@@ -353,8 +353,8 @@ void sendsMultipartPostRequestMatchTwoParams(
                 )
             )
             .multipartBody()
-            .formParam("d", value)
-            .formParam("e", other)
+            .formParam("d", value, "d.txt")
+            .formParam("e", other, "e.txt")
             .back()
             .fetch().as(RestResponse.class)
             .assertStatus(HttpURLConnection.HTTP_OK);
@@ -365,12 +365,12 @@ void sendsMultipartPostRequestMatchTwoParams(
             Matchers.is(
                 Joiner.on(Constants.CRLF).join(
                     separator,
-                    "Content-Disposition: form-data; name=\"d\"; filename=\"binary\"",
+                    "Content-Disposition: form-data; name=\"d\"; filename=\"d.txt\"",
                     RequestTest.steamContentType(),
                     "",
                     "value of € one param \"&^%*;'\"",
                     separator,
-                    "Content-Disposition: form-data; name=\"e\"; filename=\"binary\"",
+                    "Content-Disposition: form-data; name=\"e\"; filename=\"e.txt\"",
                     RequestTest.steamContentType(),
                     "",
                     "value of € two param \"&^%*;'\"",