Allow build custom HTTP client

Author: jonas-jasas

src/com/convertapi/Config.java

@@ -1,7 +1,12 @@
 package com.convertapi;
 
+import okhttp3.OkHttpClient;
+
+import java.util.function.Function;
+
 public class Config {
     private static String defaultSecret;
+    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";
@@ -10,30 +15,42 @@ public class Config {
     private final String host;
     private final String secret;
     private final int timeout;
+    private final Function<OkHttpClient.Builder, OkHttpClient.Builder> httpClientBuilder;
 
     @SuppressWarnings("unused")
-    public Config(String secret, String scheme, String host, int timeout) {
+    public Config(String secret, String scheme, String host, int timeout, Function<OkHttpClient.Builder, OkHttpClient.Builder> httpClientBuilder) {
         this.scheme = scheme;
         this.host = host;
         this.secret = secret;
         this.timeout = timeout;
+        this.httpClientBuilder = httpClientBuilder;
     }
 
     @SuppressWarnings("WeakerAccess")
     public static Config defaults() {
-        return new Config(Config.defaultSecret, SCHEME, HOST, TIMEOUT);
+        return new Config(Config.defaultSecret, SCHEME, HOST, TIMEOUT, Config.defaultHttpClientBuilder);
     }
 
     @SuppressWarnings("WeakerAccess")
     public static Config defaults(String secret) {
-        return new Config(secret, SCHEME, HOST, TIMEOUT);
+        return new Config(secret, SCHEME, HOST, TIMEOUT, Config.defaultHttpClientBuilder);
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static Config defaults(String secret, Function<OkHttpClient.Builder, OkHttpClient.Builder> httpClientBuilder) {
+        return new Config(secret, SCHEME, HOST, TIMEOUT, httpClientBuilder);
     }
 
     @SuppressWarnings("unused")
     public static void setDefaultSecret(String defaultSecret) {
         Config.defaultSecret = defaultSecret;
     }
 
+    @SuppressWarnings("unused")
+    public static void setDefaultHttpBuilder(Function<OkHttpClient.Builder, OkHttpClient.Builder> httpClientBuilder) {
+        Config.defaultHttpClientBuilder = httpClientBuilder;
+    }
+
     int getTimeout() {
         return timeout;
     }
@@ -49,4 +66,8 @@ String getHost() {
     String getSecret() {
         return secret;
     }
+
+    Function<OkHttpClient.Builder, OkHttpClient.Builder> getHttpClientBuilder() {
+        return httpClientBuilder;
+    }
 }

src/com/convertapi/ConvertApi.java

@@ -53,15 +53,15 @@ public static CompletableFuture<ConversionResult> convert(String fromFormat, Str
                 }
             }
 
-            Request request = new Request.Builder()
+            Request request = Http.getRequestBuilder()
                     .url(url)
                     .addHeader("Accept", "application/json")
                     .post(multipartBuilder.build())
                     .build();
 
             String bodyString;
             try {
-                Response response = Http.getClient().newCall(request).execute();
+                Response response = Http.getClient(config).newCall(request).execute();
                 //noinspection ConstantConditions
                 bodyString = response.body().string();
                 if (response.code() != 200) {
@@ -84,7 +84,7 @@ public static User getUser() {
 
     public static User getUser(Config config) {
         HttpUrl url = Http.getUrlBuilder(config).addPathSegment("user").build();
-        Request request = new Request.Builder()
+        Request request = Http.getRequestBuilder()
                 .url(url)
                 .addHeader("Accept", "application/json")
                 .build();

src/com/convertapi/Http.java

@@ -8,6 +8,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 
 class Http {
     private static final OkHttpClient client = new OkHttpClient();
@@ -16,6 +17,13 @@ static OkHttpClient getClient() {
         return client;
     }
 
+    static OkHttpClient getClient(Config config) {
+        return config.getHttpClientBuilder()
+                .apply(getClient().newBuilder())
+                .readTimeout(config.getTimeout() + 5, TimeUnit.SECONDS)
+                .build();
+    }
+
     static HttpUrl.Builder getUrlBuilder(Config config) {
         return new HttpUrl.Builder()
                 .scheme(config.getScheme())
@@ -26,7 +34,7 @@ static HttpUrl.Builder getUrlBuilder(Config config) {
 
     static CompletableFuture<InputStream> requestGet(String url) {
         return CompletableFuture.supplyAsync(() -> {
-            Request request = new Request.Builder().url(url).build();
+            Request request = getRequestBuilder().url(url).build();
             Response response;
             try {
                 response = getClient().newCall(request).execute();
@@ -37,4 +45,9 @@ static CompletableFuture<InputStream> requestGet(String url) {
             return response.body().byteStream();
         });
     }
+
+    static Request.Builder getRequestBuilder() {
+        return new Request.Builder()
+                .header("User-Agent", "convertapi-java");
+    }
 }

src/com/convertapi/Param.java

@@ -96,7 +96,7 @@ public List<String> getValue() throws ExecutionException, InterruptedException {
 
     private static CompletableFuture<List<String>> upload(byte[] data, String fileName, MediaType fileContentType, Config config) {
         return CompletableFuture.supplyAsync(() -> {
-            Request request = new Request.Builder()
+            Request request = Http.getRequestBuilder()
                     .url(Http.getUrlBuilder(config).addPathSegment("upload")
                             .addQueryParameter("filename", fileName)
                             .build())