Refactor ServiceGenerator

Use HTTP_1_1 as single protocol

Author: mjuchli

src/main/java/com/aaaccell/fixer/Fixer.java

@@ -3,7 +3,7 @@
 public class Fixer {
 
     public static FixerRequestBuilder builder(String accessKey) {
-        return new FixerRequestBuilder(FixerServiceGenerator.createService(FixerService.class), accessKey);
+        return new FixerRequestBuilder(new FixerServiceGenerator().createService(FixerService.class), accessKey);
     }
 
 }

src/main/java/com/aaaccell/fixer/FixerRequestBuilder.java

@@ -6,8 +6,8 @@
 
 public class FixerRequestBuilder {
 
-    private FixerService fixerService;
-    private String accessKey;
+    private final FixerService fixerService;
+    private final String accessKey;
 
     public FixerRequestBuilder(FixerService fixerService, String accessKey) {
         this.fixerService = fixerService;

src/main/java/com/aaaccell/fixer/FixerServiceGenerator.java

@@ -3,41 +3,36 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 
-public class FixerServiceGenerator {
-    private static final String BASE_URL = "https://data.fixer.io/api/";
-
-    private static final Gson gson = new GsonBuilder()
-            .registerTypeAdapterFactory(new FixerResponseTypeAdapterFactory())
-            .create();
-
-    private static final Retrofit.Builder builder
-            = new Retrofit.Builder()
-            .baseUrl(BASE_URL)
-            .addConverterFactory(GsonConverterFactory.create(gson));
+import java.util.Collections;
 
-    private static Retrofit retrofit = builder.build();
-
-    private static final OkHttpClient.Builder httpClient
-            = new OkHttpClient.Builder();
+public class FixerServiceGenerator {
+    protected static final String BASE_URL = "https://data.fixer.io/api/";
 
-    private static final HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
+    protected OkHttpClient createHttpClient() {
+        return new OkHttpClient.Builder()
+                .addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BASIC))
+                .protocols(Collections.singletonList(Protocol.HTTP_1_1))
+                .build();
+    }
 
-    public static <S> S createService(Class<S> serviceClass) {
-        return createService(serviceClass, HttpLoggingInterceptor.Level.BASIC);
+    protected Gson createGson() {
+        return new GsonBuilder()
+                .registerTypeAdapterFactory(new FixerResponseTypeAdapterFactory())
+                .create();
     }
 
-    public static <S> S createService(Class<S> serviceClass, HttpLoggingInterceptor.Level logLevel) {
-        logging.setLevel(logLevel);
-        if (!httpClient.interceptors().contains(logging)) {
-            httpClient.addInterceptor(logging);
-            builder.client(httpClient.build());
-            retrofit = builder.build();
-        }
-        return retrofit.create(serviceClass);
+    public <S> S createService(Class<S> serviceClass) {
+        return new Retrofit.Builder()
+                .baseUrl(BASE_URL)
+                .addConverterFactory(GsonConverterFactory.create(createGson()))
+                .client(createHttpClient())
+                .build()
+                .create(serviceClass);
     }
 
 }