Merge branch 'release/1.4'

jonas-jasas · jonas-jasas · commit 56edbb5fde5b · 2018-08-20T17:32:02.000+03:00
diff --git a/README.md b/README.md
@@ -30,9 +30,7 @@ Example to convert DOCX file to PDF. All supported formats and options can be fo
 [here](https://www.convertapi.com).
 
 ```java
-CompletableFuture<ConversionResult> result = ConvertApi.convert("docx", "pdf", new Param[]{
-    new Param("file", Paths.get("test.docx"))
-});
+CompletableFuture<ConversionResult> result = ConvertApi.convert("docx", "pdf", new Param("file", Paths.get("test.docx")));
 
 // save to file
 result.get().saveFile(Paths.get("my_file.pdf")).get();
@@ -54,9 +52,9 @@ Integer cost = result.get().conversionCost();
 #### Convert file url
 
 ```java
-CompletableFuture<ConversionResult> result = ConvertApi.convert("pptx", "pdf", new Param[]{
+CompletableFuture<ConversionResult> result = ConvertApi.convert("pptx", "pdf",
     new Param("file", "https://cdn.convertapi.com/cara/testfiles/presentation.pptx")
-});
+);
 ```
 
 #### Additional conversion parameters
@@ -65,12 +63,12 @@ ConvertAPI accepts extra conversion parameters depending on converted formats. A
 parameters and explanations can be found [here](https://www.convertapi.com).
 
 ```java
-CompletableFuture<ConversionResult> result = ConvertApi.convert("pdf", "jpg", new Param[]{
+CompletableFuture<ConversionResult> result = ConvertApi.convert("pdf", "jpg",
         new Param("file", Paths.get("test.pdf")),
         new Param("scaleimage", "true"),
         new Param("scaleproportions", "true"),
         new Param("imageheight", 300)
-});
+);
 ```
 
 ### User information
diff --git a/src/com/convertapi/ConversionResult.java b/src/com/convertapi/ConversionResult.java
@@ -37,6 +37,7 @@ public Integer conversionCost() {
     }
 
     public ConversionResultFile getFile(int index) {
+        if (index < 0) index = response.Files.length + index;
         return new ConversionResultFile(response.Files[index]);
     }
 
diff --git a/src/com/convertapi/ConvertApi.java b/src/com/convertapi/ConvertApi.java
@@ -11,7 +11,9 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -22,7 +24,7 @@ public class ConvertApi {
     private static final List<String> IGNORE_PARAMS = Arrays.asList( "storefile", "async", "jobid", "timeout");
 
     @SuppressWarnings("unused")
-    public static CompletableFuture<ConversionResult> convert(String fromFormat, String toFormat, Param[] params) {
+    public static CompletableFuture<ConversionResult> convert(String fromFormat, String toFormat, Param... params) {
         return convert(fromFormat, toFormat, params, Config.defaults());
     }
 
@@ -38,18 +40,17 @@ public static CompletableFuture<ConversionResult> convert(String fromFormat, Str
                     .build();
 
             MultipartBody.Builder multipartBuilder = new MultipartBody.Builder();
-            for (Param param: params) {
-                if (!IGNORE_PARAMS.contains(param.getName())) {
-                    try {
-                        if (param.getValue().size() == 1) {
-                            multipartBuilder.addFormDataPart(param.getName(), param.getValue().get(0));
-                        } else {
-                            for (int i = 0; i < param.getValue().size(); i++) {
-                                multipartBuilder.addFormDataPart(param.getName() + "[" + i + "]", param.getValue().get(i));
-                            }
+            HashMap<String, List<String>> paramValues = getParamValues(params);
+
+            for (String name : paramValues.keySet()) {
+                if (!IGNORE_PARAMS.contains(name)) {
+                    List<String> values = paramValues.get(name);
+                    if (paramValues.get(name).size() == 1) {
+                        multipartBuilder.addFormDataPart(name, values.get(0));
+                    } else {
+                        for (int i = 0; i < values.size(); i++) {
+                            multipartBuilder.addFormDataPart(name + "[" + i + "]", values.get(i));
                         }
-                    } catch (ExecutionException | InterruptedException e) {
-                        throw new RuntimeException(e);
                     }
                 }
             }
@@ -133,4 +134,19 @@ private static String getFileExtension(Path path) {
         String name = path.getFileName().toString();
         return name.substring(name.lastIndexOf(".") + 1);
     }
+
+    private static HashMap<String, List<String>> getParamValues(Param[] params) {
+        HashMap<String, List<String>> result = new HashMap<>();
+
+        try {
+            for (Param param : params) {
+                List<String> values = result.computeIfAbsent(param.getName(), (v) -> new ArrayList<>());
+                values.addAll(param.getValue());
+            }
+        } catch (InterruptedException | ExecutionException e) {
+            throw new RuntimeException(e);
+        }
+
+        return result;
+    }
 }
diff --git a/src/com/convertapi/Http.java b/src/com/convertapi/Http.java
@@ -59,7 +59,7 @@ static CompletableFuture<Void> requestDelete(String url) {
     }
 
     static Request.Builder getRequestBuilder() {
-        return new Request.Builder()
-                .header("User-Agent", "convertapi-java");
+        String agent = String.format("ConvertAPI-Java/%.1f (%s)", 1.4, System.getProperty("os.name"));
+        return new Request.Builder().header("User-Agent", agent);
     }
 }
diff --git a/src/com/convertapi/Param.java b/src/com/convertapi/Param.java
@@ -10,6 +10,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -83,6 +84,12 @@ public Param(String name, ConversionResult value, int fileIndex) {
         this.value = CompletableFuture.completedFuture(valueList);
     }
 
+    @SuppressWarnings("WeakerAccess")
+    public Param(String name, CompletableFuture<ConversionResult> value, int fileIndex) {
+        this(name);
+        this.value = value.thenApply((res) -> Arrays.asList(res.getFile(fileIndex).getUrl()));
+    }
+
     @SuppressWarnings("unused")
     public Param(String name, CompletableFuture<ConversionResult> value) {
         this(name);
diff --git a/src/com/convertapi/examples/Advanced.java b/src/com/convertapi/examples/Advanced.java
@@ -1,24 +1,28 @@
 package com.convertapi.examples;
 
+import com.convertapi.Config;
+import com.convertapi.ConversionResult;
+import com.convertapi.ConvertApi;
+import com.convertapi.Param;
+
 import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import com.convertapi.Config;
-import com.convertapi.ConversionResult;
-import com.convertapi.ConvertApi;
-import com.convertapi.Param;
+import static java.lang.System.getenv;
 
 /**
  * Example of HTTP client setup to use HTTP proxy server.
  */
 
 public class Advanced {
     public static void main(String[] args) throws IOException, ExecutionException, InterruptedException {
-        Config.setDefaultSecret("YOUR API SECRET");    //Get your secret at https://www.convertapi.com/a
+        Config.setDefaultSecret(getenv("CONVERTAPI_SECRET"));    //Get your secret at https://www.convertapi.com/a
 
         // Advanced HTTP client setup
         Config.setDefaultHttpBuilder(builder -> {
@@ -31,7 +35,7 @@ public static void main(String[] args) throws IOException, ExecutionException, I
         // Conversion
         Param fileParam = new Param("file", "https://cdn.convertapi.com/cara/testfiles/presentation.pptx");
         System.out.println("Converting remote PPTX to PDF");
-        CompletableFuture<ConversionResult> result = ConvertApi.convert("pptx", "pdf", new Param[]{fileParam});
+        CompletableFuture<ConversionResult> result = ConvertApi.convert("pptx", "pdf", fileParam);
         Path pdfFile = Paths.get(System.getProperty("java.io.tmpdir") + "/myfile.pdf");
         result.get().saveFile(pdfFile).get();
 
diff --git a/src/com/convertapi/examples/ConversionChaining.java b/src/com/convertapi/examples/ConversionChaining.java
@@ -1,14 +1,17 @@
 package com.convertapi.examples;
 
+import com.convertapi.Config;
+import com.convertapi.ConversionResult;
+import com.convertapi.ConvertApi;
+import com.convertapi.Param;
+
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import com.convertapi.Config;
-import com.convertapi.ConversionResult;
-import com.convertapi.ConvertApi;
-import com.convertapi.Param;
+
+import static java.lang.System.getenv;
 
 /**
  * Short example of conversions chaining, the PDF pages extracted and saved as separated JPGs and then ZIP'ed
@@ -17,13 +20,13 @@
 
 public class ConversionChaining {
     public static void main(String[] args) throws IOException, ExecutionException, InterruptedException {
-        Config.setDefaultSecret("YOUR API SECRET");    //Get your secret at https://www.convertapi.com/a
+        Config.setDefaultSecret(getenv("CONVERTAPI_SECRET"));    //Get your secret at https://www.convertapi.com/a
 
         System.out.println("Converting PDF to JPG and compressing result files with ZIP");
-        CompletableFuture<ConversionResult> jpgResult = ConvertApi.convert("docx", "jpg", new Param[]{new Param("file", Paths.get("test-files/test.docx"))});
+        CompletableFuture<ConversionResult> jpgResult = ConvertApi.convert("docx", "jpg", new Param("file", Paths.get("test-files/test.docx")));
         System.out.println("ConvertApi.convert is not blocking method, proceeding to ZIP conversion");
 
-        CompletableFuture<ConversionResult> zipResult = ConvertApi.convert("jpg", "zip", new Param[]{new Param("files", jpgResult)});
+        CompletableFuture<ConversionResult> zipResult = ConvertApi.convert("jpg", "zip", new Param("files", jpgResult));
 
         System.out.println("Saving result file (blocking operation)");
         Path tempDir = Paths.get(System.getProperty("java.io.tmpdir"));
diff --git a/src/com/convertapi/examples/ConvertRemoteFile.java b/src/com/convertapi/examples/ConvertRemoteFile.java
@@ -1,27 +1,30 @@
 package com.convertapi.examples;
 
+import com.convertapi.Config;
+import com.convertapi.ConversionResult;
+import com.convertapi.ConvertApi;
+import com.convertapi.Param;
+
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import com.convertapi.Config;
-import com.convertapi.ConversionResult;
-import com.convertapi.ConvertApi;
-import com.convertapi.Param;
+
+import static java.lang.System.getenv;
 
 /**
  * Example of conversion remote file. Converting file must be accessible from the internet.
  */
 
 public class ConvertRemoteFile {
     public static void main(String[] args) throws IOException, ExecutionException, InterruptedException {
-        Config.setDefaultSecret("YOUR API SECRET");    //Get your secret at https://www.convertapi.com/a
-
-        Param fileParam = new Param("file", "https://cdn.convertapi.com/cara/testfiles/presentation.pptx");
+        Config.setDefaultSecret(getenv("CONVERTAPI_SECRET"));    //Get your secret at https://www.convertapi.com/a
 
         System.out.println("Converting remote PPTX to PDF");
-        CompletableFuture<ConversionResult> result = ConvertApi.convert("pptx", "pdf", new Param[]{fileParam});
+        CompletableFuture<ConversionResult> result = ConvertApi.convert("pptx", "pdf",
+                new Param("file", "https://cdn.convertapi.com/cara/testfiles/presentation.pptx")
+        );
 
         Path pdfFile = Paths.get(System.getProperty("java.io.tmpdir") + "/myfile.pdf");
         result.get().saveFile(pdfFile).get();
diff --git a/src/com/convertapi/examples/ConvertWebToPdf.java b/src/com/convertapi/examples/ConvertWebToPdf.java
@@ -1,14 +1,17 @@
 package com.convertapi.examples;
 
+import com.convertapi.Config;
+import com.convertapi.ConversionResult;
+import com.convertapi.ConvertApi;
+import com.convertapi.Param;
+
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import com.convertapi.Config;
-import com.convertapi.ConversionResult;
-import com.convertapi.ConvertApi;
-import com.convertapi.Param;
+
+import static java.lang.System.getenv;
 
 /**
  * Example of converting Web Page URL to PDF file
@@ -17,13 +20,13 @@
 
 public class ConvertWebToPdf {
     public static void main(String[] args) throws IOException, ExecutionException, InterruptedException {
-        Config.setDefaultSecret("YOUR API SECRET");    //Get your secret at https://www.convertapi.com/a
+        Config.setDefaultSecret(getenv("CONVERTAPI_SECRET"));    //Get your secret at https://www.convertapi.com/a
 
         System.out.println("Converting WEB to PDF");
-        CompletableFuture<ConversionResult> result = ConvertApi.convert("web", "pdf", new Param[]{
+        CompletableFuture<ConversionResult> result = ConvertApi.convert("web", "pdf",
                 new Param("url", "https://en.wikipedia.org/wiki/Data_conversion"),
                 new Param("filename", "web-example")
-        });
+        );
 
         Path tmpDir = Paths.get(System.getProperty("java.io.tmpdir"));
         CompletableFuture<Path> pdfFile = result.get().saveFile(tmpDir);
diff --git a/src/com/convertapi/examples/ConvertWordToPdfAndPng.java b/src/com/convertapi/examples/ConvertWordToPdfAndPng.java
@@ -12,6 +12,8 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
+import static java.lang.System.getenv;
+
 /**
  * Example of saving Word docx to PDF and to PNG
  * Conversion is made by using same file parameter and processing two conversions simultaneously
@@ -21,15 +23,15 @@
 
 public class ConvertWordToPdfAndPng {
     public static void main(String[] args) throws IOException, ExecutionException, InterruptedException {
-        Config.setDefaultSecret("YOUR API SECRET");    //Get your secret at https://www.convertapi.com/a
+        Config.setDefaultSecret(getenv("CONVERTAPI_SECRET"));    //Get your secret at https://www.convertapi.com/a
         Path tempDir = Paths.get(System.getProperty("java.io.tmpdir"));
 
         System.out.println("Converting DOCX to PDF and JPG in parallel");
 
         Param docxFileParam = new Param("file", Paths.get("test-files/test.docx"));
 
-        CompletableFuture<ConversionResult> pdfResult = ConvertApi.convert("docx", "pdf", new Param[]{docxFileParam});
-        CompletableFuture<ConversionResult> jpgResult = ConvertApi.convert("docx", "jpg", new Param[]{docxFileParam});
+        CompletableFuture<ConversionResult> pdfResult = ConvertApi.convert("docx", "pdf", docxFileParam);
+        CompletableFuture<ConversionResult> jpgResult = ConvertApi.convert("docx", "jpg", docxFileParam);
 
         System.out.println("PDF file saved to: " + pdfResult.get().saveFile(tempDir).get());
 
diff --git a/src/com/convertapi/examples/CreatePdfThumbnail.java b/src/com/convertapi/examples/CreatePdfThumbnail.java
@@ -11,6 +11,8 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
+import static java.lang.System.getenv;
+
 /**
  * Example of extracting first page from PDF and then chaining conversion PDF page to JPG.
  * https://www.convertapi.com/pdf-to-extract
@@ -19,22 +21,22 @@
 
 public class CreatePdfThumbnail {
     public static void main(String[] args) throws IOException, ExecutionException, InterruptedException {
-        Config.setDefaultSecret("YOUR API SECRET");    //Get your secret at https://www.convertapi.com/a
+        Config.setDefaultSecret(getenv("CONVERTAPI_SECRET"));    //Get your secret at https://www.convertapi.com/a
         Path tempDir = Paths.get(System.getProperty("java.io.tmpdir"));
 
         System.out.println("Creating PDF thumbnail");
 
-        CompletableFuture<ConversionResult> pdfFirstPageResult = ConvertApi.convert("pdf", "extract", new Param[]{
+        CompletableFuture<ConversionResult> pdfFirstPageResult = ConvertApi.convert("pdf", "extract",
                 new Param("file", Paths.get("test-files/test.pdf")),
                 new Param("pagerange", "1")
-        });
+        );
 
-        CompletableFuture<ConversionResult> thumbnailResult = ConvertApi.convert("pdf", "jpg", new Param[]{
+        CompletableFuture<ConversionResult> thumbnailResult = ConvertApi.convert("pdf", "jpg",
                 new Param("file", pdfFirstPageResult),
                 new Param("scaleimage", "true"),
                 new Param("scaleproportions", "true"),
                 new Param("imageheight", 300)
-        });
+        );
 
         System.out.println("JPG thumbnail file saved to: " + thumbnailResult.get().saveFile(tempDir).get());
     }
diff --git a/src/com/convertapi/examples/SimpleConversion.java b/src/com/convertapi/examples/SimpleConversion.java
@@ -2,12 +2,14 @@
 
 import com.convertapi.ConvertApi;
 
+import static java.lang.System.getenv;
+
 /**
  * Most simple conversion example
  */
 
 public class SimpleConversion {
     public static void main(String[] args) {
-        ConvertApi.convert("test-files/test.docx", "result.pdf", "YOUR API SECRET");
+        ConvertApi.convert("test-files/test.docx", "result.pdf", getenv("CONVERTAPI_SECRET"));
     }
 }
diff --git a/src/com/convertapi/examples/SplitAndMergePdf.java b/src/com/convertapi/examples/SplitAndMergePdf.java
diff --git a/src/com/convertapi/examples/UserInformation.java b/src/com/convertapi/examples/UserInformation.java

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ public Integer conversionCost() {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public ConversionResultFile getFile(int index) {`
	`40`	`+ if (index < 0) index = response.Files.length + index;`
`40`	`41`	`return new ConversionResultFile(response.Files[index]);`
`41`	`42`	`}`
`42`	`43`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ static CompletableFuture<Void> requestDelete(String url) {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`static Request.Builder getRequestBuilder() {`
`62`		`- return new Request.Builder()`
`63`		`- .header("User-Agent", "convertapi-java");`
	`62`	`+ String agent = String.format("ConvertAPI-Java/%.1f (%s)", 1.4, System.getProperty("os.name"));`
	`63`	`+ return new Request.Builder().header("User-Agent", agent);`
`64`	`64`	`}`
`65`	`65`	`}`