Allow customized interceptors

Author: paul-hsieh

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.taboola</groupId>
     <artifactId>api-java-client-core</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>API Java client core</description>

src/main/java/com/taboola/rest/api/RestAPIClient.java

@@ -1,5 +1,7 @@
 package com.taboola.rest.api;
 
+import okhttp3.Interceptor;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -51,7 +53,7 @@ public static RestAPIClientBuilder builder() {
     }
 
     public static class RestAPIClientBuilder {
-        private static final String VERSION = "1.0.6";
+        private static final String VERSION = "1.0.7";
         private static final Integer DEFAULT_MAX_IDLE_CONNECTIONS = 5;
         private static final Long DEFAULT_KEEP_ALIVE_DURATION_MILLIS = 300_000L;
         private static final SerializationConfig DEFAULT_SERIALIZATION_CONFIG = new SerializationConfig();
@@ -78,6 +80,7 @@ public static class RestAPIClientBuilder {
         private final StringResponseFactories stringResponseFactories = new StringResponseFactories();
         private HttpLoggingLevel loggingLevel;
         private CommunicationInterceptor communicationInterceptor;
+        private List<Interceptor> interceptors = new ArrayList<>();
 
         public RestAPIClientBuilder setLoggingLevel(HttpLoggingLevel loggingLevel) {
             this.loggingLevel = loggingLevel;
@@ -164,12 +167,17 @@ public RestAPIClientBuilder addStringBodyResponseFactory(Class<?> clazz, StringR
             return this;
         }
 
+        public RestAPIClientBuilder addInterceptor(Interceptor interceptor) {
+            interceptors.add(interceptor);
+            return this;
+        }
+
         public RestAPIClient build() {
             organizeState();
             String finalUserAgent = String.format("%s/%s/%s (%s)", userAgentPrefix, restAPIVersion, VERSION, userAgentSuffix);
             Collection<RequestHeader> headers = getAllHeaders(this.headers, finalUserAgent);
             CommunicationConfig config = new CommunicationConfig(baseUrl, connectionTimeoutMillis, readTimeoutMillis, writeTimeoutMillis, maxIdleConnections,
-                    keepAliveDurationMillis, headers, debug, exceptionFactory, objectMapper, stringResponseFactories, loggingLevel, communicationInterceptor);
+                    keepAliveDurationMillis, headers, debug, exceptionFactory, objectMapper, stringResponseFactories, loggingLevel, communicationInterceptor, interceptors);
             return new RestAPIClient(new CommunicationFactory(config));
         }
 

src/main/java/com/taboola/rest/api/internal/CommunicationFactory.java

@@ -56,16 +56,19 @@ private Retrofit.Builder createRetrofitBuilder(CommunicationConfig config) {
     }
 
     private OkHttpClient createOkHttpClient(CommunicationConfig config) {
-        return new OkHttpClient.Builder()
+        OkHttpClient.Builder builder = new OkHttpClient.Builder()
                 .addInterceptor(new HeadersInterceptor(config.getHeaders()))
                 .addInterceptor(createLoggingInterceptor(config))
                 .addInterceptor(new ImmutableRequestResponseInterceptor(config.getCommunicationInterceptor()))
                 .readTimeout(config.getReadTimeoutMillis(), TimeUnit.MILLISECONDS)
                 .writeTimeout(config.getWriteTimeoutMillis(), TimeUnit.MILLISECONDS)
                 .connectTimeout(config.getConnectionTimeoutMillis(), TimeUnit.MILLISECONDS)
                 .connectionPool(new ConnectionPool(config.getMaxIdleConnections(),
-                        config.getKeepAliveDurationMillis(), TimeUnit.MILLISECONDS))
-                .build();
+                        config.getKeepAliveDurationMillis(), TimeUnit.MILLISECONDS));
+
+        config.getInterceptors().forEach(builder::addInterceptor);
+
+        return builder.build();
     }
 
 

src/main/java/com/taboola/rest/api/internal/config/CommunicationConfig.java

@@ -1,6 +1,8 @@
 package com.taboola.rest.api.internal.config;
 
 
+import okhttp3.Interceptor;
+
 import java.util.Collection;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -31,12 +33,13 @@ public class CommunicationConfig {
     private final StringResponseFactories stringResponseFactories;
     private final HttpLoggingLevel loggingLevel;
     private final CommunicationInterceptor communicationInterceptor;
+    private final Collection<Interceptor> interceptors;
 
     public CommunicationConfig(String baseUrl, Long connectionTimeoutMillis, Long readTimeoutMillis,
                                Long writeTimeoutMillis, Integer maxIdleConnections, Long keepAliveDurationMillis,
                                Collection<RequestHeader> headers, boolean debug, ExceptionFactory exceptionFactory,
                                ObjectMapper objectMapper, StringResponseFactories stringResponseFactories, HttpLoggingLevel loggingLevel,
-                               CommunicationInterceptor communicationInterceptor) {
+                               CommunicationInterceptor communicationInterceptor, Collection<Interceptor> interceptors) {
         this.baseUrl = baseUrl;
         this.connectionTimeoutMillis = connectionTimeoutMillis;
         this.readTimeoutMillis = readTimeoutMillis;
@@ -50,6 +53,7 @@ public CommunicationConfig(String baseUrl, Long connectionTimeoutMillis, Long re
         this.stringResponseFactories = stringResponseFactories;
         this.loggingLevel = loggingLevel;
         this.communicationInterceptor = communicationInterceptor;
+        this.interceptors = interceptors;
     }
 
     public String getBaseUrl() {
@@ -104,6 +108,10 @@ public CommunicationInterceptor getCommunicationInterceptor() {
         return communicationInterceptor;
     }
 
+    public Collection<Interceptor> getInterceptors() {
+        return interceptors;
+    }
+
     @Override
     public String toString() {
         return "CommunicationConfig{" +
@@ -120,6 +128,7 @@ public String toString() {
                 ", stringResponseFactories=" + stringResponseFactories +
                 ", loggingLevel=" + loggingLevel +
                 ", communicationInterceptor=" + communicationInterceptor +
+                ", interceptors=" + interceptors +
                 '}';
     }
 }

src/test/java/com/taboola/rest/api/internal/CommunicationFactoryTest.java

@@ -39,7 +39,7 @@ public void beforeTest() {
         CommunicationConfig communicationConfig = new CommunicationConfig("http://localhost",
                 1L, 1L, 1L, 1, 60L,
                 Collections.singleton(new UserAgentHeader("Dummy-Agent")),true, new DefaultExceptionFactory(),
-                new ObjectMapper(), new StringResponseFactories(), HttpLoggingLevel.BASIC, new NoOpCommunicationInterceptor());
+                new ObjectMapper(), new StringResponseFactories(), HttpLoggingLevel.BASIC, new NoOpCommunicationInterceptor(), Collections.emptyList());
         testInstance = new CommunicationFactory(communicationConfig);
     }