v2.1

Author: jonas-jasas

maven-release.sh

@@ -2,7 +2,7 @@
 
 # Usage: ./maven-release.sh v2.0 2.1-SNAPSHOT 2.0
 
-branch_to_release="master"
+branch_to_release="develop"
 
 echo "Switching to the release branch..."
 git fetch

src/com/convertapi/examples/AlternativeConverter.java

@@ -1,4 +1,4 @@
-package com.convertapi;
+package com.convertapi.client;
 
 import okhttp3.OkHttpClient;
 
@@ -28,17 +28,17 @@ public Config(String secret, String scheme, String host, int timeout, Function<O
 
     @SuppressWarnings("WeakerAccess")
     public static Config defaults() {
-        return new Config(Config.defaultSecret, SCHEME, HOST, TIMEOUT, Config.defaultHttpClientBuilder);
+        return new Config(Config.defaultSecret, SCHEME, HOST, defaultTimeout, Config.defaultHttpClientBuilder);
     }
 
     @SuppressWarnings("WeakerAccess")
     public static Config defaults(String secret) {
-        return new Config(secret, SCHEME, HOST, TIMEOUT, Config.defaultHttpClientBuilder);
+        return new Config(secret, 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, TIMEOUT, httpClientBuilder);
+        return new Config(secret, SCHEME, HOST, defaultTimeout, httpClientBuilder);
     }
 
     @SuppressWarnings("unused")

src/com/convertapi/examples/ConvertStream.java

@@ -1,8 +1,8 @@
 package com.convertapi.client;
 
 import com.convertapi.client.model.ConversionResponse;
-import com.convertapi.client.model.User;
 import com.convertapi.client.model.RemoteUploadResponse;
+import com.convertapi.client.model.User;
 import com.google.gson.Gson;
 import okhttp3.HttpUrl;
 import okhttp3.MultipartBody;
@@ -136,11 +136,11 @@ public static void convertFile(String fromPathToFile, String toPathToFile) {
         convertFile(fromPathToFile, toPathToFile, Config.defaults().getSecret());
     }
 
-    public static void convert(String fromPathToFile, String toPathToFile, String secret) {
+    public static void convertFile(String fromPathToFile, String toPathToFile, String secret) {
         try {
             Path fromPath = Paths.get(fromPathToFile);
             Path toPath = Paths.get(toPathToFile);
-            convert(fromPath, getFileExtension(toPath), secret).get().saveFile(toPath).get();
+            convertFile(fromPath, getFileExtension(toPath), secret).get().saveFile(toPath).get();
         } catch (IOException | ExecutionException | InterruptedException e) {
             throw new RuntimeException(e);
         }

src/com/convertapi/examples/CreateExceptionHandling.java

@@ -1,6 +1,6 @@
 package com.convertapi.client;
 
-import com.convertapi.model.RemoteUploadResponse;
+import com.convertapi.client.model.RemoteUploadResponse;
 import com.google.gson.Gson;
 import okhttp3.*;
 

src/com/convertapi/examples/SimpleConversion.java

@@ -1,4 +1,4 @@
-package com.convertapi;
+package com.convertapi.client;
 
 import okhttp3.MediaType;
 import okhttp3.Request;

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

@@ -1,4 +1,4 @@
-package com.convertapi;
+package com.convertapi.client;
 
 import okhttp3.MediaType;
 import okhttp3.RequestBody;