Add token authentication

Author: kmozsi

.gitignore

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

examples/src/main/java/com/convertapi/examples/TokenAuthentication.java

@@ -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 SimpleConversion {
+
+    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");
+    }
+}

pom.xml

@@ -71,12 +71,12 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.5</version>
+            <version>2.8.8</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.10.0</version>
+            <version>4.9.2</version>
         </dependency>
     </dependencies>
 

src/main/java/com/convertapi/client/Config.java

@@ -7,14 +7,17 @@
 public class Config {
 
     private static String defaultSecret;
+    private static String defaultToken;
+    private static String defaultApiKey;
     private static int defaultTimeout = 0;  // Infinite read waiting
     private static Function<OkHttpClient.Builder, OkHttpClient.Builder> defaultHttpClientBuilder = b -> b;
     private static final String SCHEME = "https";
-    @SuppressWarnings("SpellCheckingInspection")
     private static final String HOST = "v2.convertapi.com";
     private final String scheme;
     private final String host;
     private final String secret;
+    private final String token;
+    private final String apiKey;
     private final int timeout;
     private final Function<OkHttpClient.Builder, OkHttpClient.Builder> httpClientBuilder;
 
@@ -23,30 +26,65 @@ public Config(String secret, String scheme, String host, int timeout, Function<O
         this.scheme = scheme;
         this.host = host;
         this.secret = secret;
+        this.token = null;
+        this.apiKey = null;
+        this.timeout = timeout;
+        this.httpClientBuilder = httpClientBuilder;
+    }
+
+    @SuppressWarnings("unused")
+    public Config(String token, String apiKey, String scheme, String host, int timeout, Function<OkHttpClient.Builder, OkHttpClient.Builder> httpClientBuilder) {
+        this.scheme = scheme;
+        this.host = host;
+        this.secret = null;
+        this.token = token;
+        this.apiKey = apiKey;
         this.timeout = timeout;
         this.httpClientBuilder = httpClientBuilder;
     }
 
     @SuppressWarnings("WeakerAccess")
     public static Config defaults() {
-        return new Config(Config.defaultSecret, SCHEME, HOST, defaultTimeout, Config.defaultHttpClientBuilder);
+        if (Config.defaultSecret != null)
+            return new Config(Config.defaultSecret, SCHEME, HOST, defaultTimeout, Config.defaultHttpClientBuilder);
+        return new Config(Config.defaultToken, Config.defaultApiKey, SCHEME, HOST, defaultTimeout, Config.defaultHttpClientBuilder);
     }
 
     @SuppressWarnings("WeakerAccess")
     public static Config defaults(String secret) {
         return new Config(secret, SCHEME, HOST, defaultTimeout, Config.defaultHttpClientBuilder);
     }
 
+    @SuppressWarnings("WeakerAccess")
+    public static Config defaults(String token, String apiKey) {
+        return new Config(token, apiKey, SCHEME, HOST, defaultTimeout, Config.defaultHttpClientBuilder);
+    }
+
     @SuppressWarnings("WeakerAccess")
     public static Config defaults(String secret, Function<OkHttpClient.Builder, OkHttpClient.Builder> httpClientBuilder) {
         return new Config(secret, SCHEME, HOST, defaultTimeout, httpClientBuilder);
     }
 
+    @SuppressWarnings("WeakerAccess")
+    public static Config defaults(String token, String apiKey, Function<OkHttpClient.Builder, OkHttpClient.Builder> httpClientBuilder) {
+        return new Config(token, apiKey, SCHEME, HOST, defaultTimeout, httpClientBuilder);
+    }
+
     @SuppressWarnings("unused")
     public static void setDefaultSecret(String defaultSecret) {
         Config.defaultSecret = defaultSecret;
     }
 
+    @SuppressWarnings("unused")
+    public static void setDefaultToken(String defaultToken) {
+        Config.defaultToken = defaultToken;
+    }
+
+    @SuppressWarnings("unused")
+    public static void setDefaultApiKey(String defaultApiKey) {
+        Config.defaultApiKey = defaultApiKey;
+    }
+
     @SuppressWarnings("unused")
     public static void setDefaultTimeout(int defaultTimeout) {
         Config.defaultTimeout = defaultTimeout;
@@ -73,6 +111,14 @@ String getSecret() {
         return secret;
     }
 
+    String getToken() {
+        return token;
+    }
+
+    String getApiKey() {
+        return apiKey;
+    }
+
     Function<OkHttpClient.Builder, OkHttpClient.Builder> getHttpClientBuilder() {
         return httpClientBuilder;
     }

src/main/java/com/convertapi/client/ConversionResult.java

@@ -28,8 +28,7 @@ public Integer fileCount() {
     }
 
     public List<String> urls() {
-        @SuppressWarnings("unchecked")
-        List<String> valueList = new ArrayList();
+        List<String> valueList = new ArrayList<>();
         for (ConversionResponseFile file : response.Files) {
             valueList.add(file.Url);
         }
@@ -59,7 +58,7 @@ public CompletableFuture<Path> saveFile(Path file) {
     @SuppressWarnings("WeakerAccess")
     public List<CompletableFuture<Path>> saveFiles(Path directory) {
         if (!Files.isDirectory(directory)) {
-            throw new RuntimeException("Directory expected, but received: " + directory.toString());
+            throw new RuntimeException("Directory expected, but received: " + directory);
         }
         List<CompletableFuture<Path>> paths = new ArrayList<>();
         for (int i = 0; i < response.Files.length; i++) {