Enabled httpClient replacement

Works on #1 (comment)

Author: burdoto

src/main/java/io/codebottle/api/CodeBottle.java

@@ -1,7 +1,6 @@
 package io.codebottle.api;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -16,30 +15,33 @@
 import io.codebottle.api.model.Snippet;
 import io.codebottle.api.rest.CodeBottleRequest;
 import io.codebottle.api.rest.Endpoint;
+import lombok.Builder;
+import lombok.Getter;
+import okhttp3.OkHttpClient;
 import org.jetbrains.annotations.Nullable;
 
+@Builder
 public final class CodeBottle {
     public final CompletionStage<Void> lazyLoading;
 
     private final Map<String, Language> languageCache = new ConcurrentHashMap<>();
     private final Map<String, Category> categoryCache = new ConcurrentHashMap<>();
     private final Map<String, Snippet> snippetCache = new ConcurrentHashMap<>();
-    private final String token;
-
-    public CodeBottle() {
-        this(null);
-    }
-
-    public CodeBottle(@Nullable String token) {
-        this.token = token;
+    
+    @Builder.Default
+    private final @Nullable String token = null;
+    @Builder.Default
+    private @Getter final OkHttpClient httpClient = new OkHttpClient.Builder().build(); 
 
+    {
         this.lazyLoading = CompletableFuture.allOf(requestLanguages(), requestCategories());
     }
 
+    @SuppressWarnings("ConstantConditions")
     public Optional<String> getToken() {
         return Optional.ofNullable(token);
     }
-    
+
     public Optional<Language> getLanguageByID(String id) {
         return Optional.ofNullable(languageCache.get(id));
     }
@@ -176,7 +178,7 @@ public Optional<Snippet.Revision> getSnippetRevisionByID(String snippetId, int i
         return Optional.ofNullable(snippetCache.get(snippetId))
                 .flatMap(snippet -> snippet.getRevisionByID(id));
     }
-    
+
     public Collection<Snippet.Revision> getSnippetRevisions() {
         return snippetCache.values()
                 .stream()

src/main/java/io/codebottle/api/rest/CodeBottleRequest.java

@@ -12,7 +12,6 @@
 import io.codebottle.api.rest.exception.UnexpectedStatusCodeException;
 import okhttp3.Call;
 import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
@@ -43,19 +42,18 @@ public final class CodeBottleRequest<T> {
      */
 
     private final static ObjectMapper objectMapper;
-    private final static OkHttpClient httpClient;
 
     private final Request.Builder httpRequest;
+    private final CodeBottle context;
 
     private int expected = HTTPCodes.OK;
 
     static {
         objectMapper = new ObjectMapper();
-        httpClient = new OkHttpClient.Builder()
-                .build();
     }
 
     public CodeBottleRequest(CodeBottle context) {
+        this.context = context;
         this.httpRequest = new Request.Builder()
                 .addHeader("Accept", "application/vnd.codebottle.v1+json"); // fixed request header
 
@@ -64,6 +62,10 @@ public CodeBottleRequest(CodeBottle context) {
         context.getToken().ifPresent(token -> httpRequest.addHeader("Authorization", token));
     }
 
+    public CodeBottle getContext() {
+        return context;
+    }
+
     public CodeBottleRequest<T> make(Method method, JsonNode withData) {
         httpRequest.method(method.name(), method == Method.GET ? null : RequestBody.create(withData.toString(), MediaType.parse("application/json")));
 
@@ -84,7 +86,7 @@ public CodeBottleRequest<T> to(Endpoint endpoint, Object... at) throws IllegalAr
 
     public CodeBottleRequest<T> andExpect(@MagicConstant(valuesFromClass = HTTPCodes.class) int responseCode) throws IllegalArgumentException {
         this.expected = responseCode;
-        
+
         return this;
     }
 
@@ -95,7 +97,8 @@ public CompletableFuture<T> then(Function<JsonNode, T> remap) {
             System.out.println("Requesting: " + request.method() + " @ " + request.url().toString());
 
             try {
-                final Call call = httpClient.newCall(request);
+                final Call call = context.getHttpClient()
+                        .newCall(request);
 
                 final Response response = call.execute();
                 final ResponseBody body = response.body();