Merge branch 'master' into master

Author: kmozsi

.gitignore

@@ -1,2 +1,3 @@
 .idea
-out
+out
+/target/

GETTING-STARTED.md

@@ -19,7 +19,7 @@ Add the following dependency to your pom.xml:
 <dependency>
     <groupId>com.convertapi.client</groupId>
     <artifactId>convertapi</artifactId>
-    <version>2.5</version>
+    <version>2.9</version>
 </dependency>
 ```
 
@@ -36,7 +36,7 @@ Config.setDefaultSecret("your-api-secret");
 ### File conversion
 
 Example to convert DOCX file to PDF. All supported formats and options can be found
-[here](https://www.convertapi.com).
+[here](https://www.convertapi.com/conversions).
 
 ```java
 CompletableFuture<ConversionResult> result = ConvertApi.convert("docx", "pdf", new Param("file", Paths.get("test.docx")));
@@ -69,7 +69,7 @@ CompletableFuture<ConversionResult> result = ConvertApi.convert("pptx", "pdf",
 #### Additional conversion parameters
 
 ConvertAPI accepts extra conversion parameters depending on converted formats. All conversion 
-parameters and explanations can be found [here](https://www.convertapi.com).
+parameters and explanations can be found [here](https://www.convertapi.com/conversions).
 
 ```java
 CompletableFuture<ConversionResult> result = ConvertApi.convert("pdf", "jpg",
@@ -89,6 +89,14 @@ User user = ConvertApi.getUser();
 int secondsLeft = user.SecondsLeft;
 ```
 
+### Alternative domain
+
+Create `Config` instance with the alternative domain and provide it in `convert` method. Dedicated to the region [domain list](https://www.convertapi.com/doc/servers-location).
+
+```java
+Config config = new Config(secret, "https", "eu-v2.convertapi.com", 0, httpClientBuilder);
+```
+
 ### More examples
 
 You can find more advanced examples in the [examples](https://github.com/ConvertAPI/convertapi-java/tree/master/examples/src/main/java/com/convertapi/examples) folder.

README.md

@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.convertapi.client</groupId>
             <artifactId>convertapi</artifactId>
-            <version>2.4</version>
+            <version>2.9</version>
         </dependency>
     </dependencies>
 

examples/files/test.docx

@@ -0,0 +1,40 @@
+package com.convertapi.examples;
+
+import com.convertapi.client.Config;
+import com.convertapi.client.ConversionResult;
+import com.convertapi.client.ConvertApi;
+import com.convertapi.client.Param;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import static java.lang.System.getenv;
+
+/**
+ * Example of the file conversion when data is passed as a stream.
+ */
+public class ConvertStream {
+
+    public static void main(String[] args) throws ExecutionException, InterruptedException, IOException {
+        Config.setDefaultSecret(getenv("CONVERTAPI_SECRET"));    //Get your secret at https://www.convertapi.com/a
+
+        // Creating file data stream
+        InputStream stream = Files.newInputStream(new File("src/main/resources/test.docx").toPath());
+
+        System.out.println("Converting stream of DOCX data to PDF");
+        CompletableFuture<ConversionResult> result = ConvertApi.convert("docx", "pdf",
+                new Param("file", stream, "test.docx")
+        );
+
+        Path pdfFile = Paths.get(System.getProperty("java.io.tmpdir") + "/myfile.pdf");
+        result.get().saveFile(pdfFile).get();
+
+        System.out.println("PDF file saved to: " + pdfFile.toString());
+    }
+}

examples/files/test.pdf

@@ -0,0 +1,24 @@
+package com.convertapi.examples;
+
+import com.convertapi.client.Config;
+import com.convertapi.client.ConvertApi;
+
+import static java.lang.System.getenv;
+
+/**
+ * Most simple conversion example with token authentication
+ */
+public class TokenAuthentication {
+
+    public static void main(String[] args) {
+        Config.setDefaultToken(getenv("CONVERTAPI_TOKEN"));   // Generate your token: https://www.convertapi.com/doc/auth
+        Config.setDefaultApiKey(getenv("CONVERTAPI_APIKEY"));  // Get your api key: https://www.convertapi.com/a
+        String resourcePath = "files/test.docx";
+        String tmpDir = System.getProperty("java.io.tmpdir") + "/";
+
+        // Simplified file to file conversion example
+        ConvertApi.convertFile(resourcePath, tmpDir + "/result.pdf");
+
+        System.out.println("PDF file saved to: " + tmpDir + "result.pdf");
+    }
+}

examples/pom.xml

@@ -4,7 +4,7 @@
     <artifactId>convertapi</artifactId>
     <packaging>jar</packaging>
 
-    <version>2.7-SNAPSHOT</version>
+    <version>2.10-SNAPSHOT</version>
     <name>ConvertAPI Java Client</name>
     <description>
         The ConvertAPI helps converting various file formats.
@@ -71,12 +71,12 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.5</version>
+            <version>2.8.9</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.10.0</version>
+            <version>4.9.2</version>
         </dependency>
     </dependencies>
 
@@ -92,6 +92,19 @@
         </resources>
 
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.1</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>2.8.2</version>