Releasing 1.0.8

Adding ability to setup OkHttp call timeout

Author: vladimanaev

pom.xml

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

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

@@ -53,7 +53,7 @@ public static RestAPIClientBuilder builder() {
     }
 
     public static class RestAPIClientBuilder {
-        private static final String VERSION = "1.0.7";
+        private static final String VERSION = "1.0.8";
         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();
@@ -69,6 +69,7 @@ public static class RestAPIClientBuilder {
         private Long readTimeoutMillis;
         private Integer maxIdleConnections;
         private Long keepAliveDurationMillis;
+        private Long callTimeoutMillis;
         private Boolean debug;
         private SerializationConfig serializationConfig;
         private Collection<RequestHeader> headers;
@@ -127,6 +128,11 @@ public RestAPIClientBuilder setKeepAliveDurationMillis(Long keepAliveDurationMil
             return this;
         }
 
+        public RestAPIClientBuilder setCallTimeoutMillis(Long callTimeoutMillis) {
+            this.callTimeoutMillis = callTimeoutMillis;
+            return this;
+        }
+
         public RestAPIClientBuilder setDebug(Boolean debug) {
             this.debug = debug;
             return this;
@@ -179,7 +185,7 @@ public RestAPIClient build() {
             RequestHeadersSupplier multiRequestHeadersSupplier = new MultiRequestHeadersSupplier(() -> headers, headersSupplier);
 
             CommunicationConfig config = new CommunicationConfig(baseUrl, connectionTimeoutMillis, readTimeoutMillis, writeTimeoutMillis, maxIdleConnections,
-                    keepAliveDurationMillis, multiRequestHeadersSupplier, debug, exceptionFactory, objectMapper, stringResponseFactories, loggingLevel, communicationInterceptor);
+                    keepAliveDurationMillis, callTimeoutMillis, multiRequestHeadersSupplier, debug, exceptionFactory, objectMapper, stringResponseFactories, loggingLevel, communicationInterceptor);
             return new RestAPIClient(new CommunicationFactory(config));
         }
 
@@ -211,6 +217,10 @@ private void organizeState() {
                 writeTimeoutMillis = 0L;
             }
 
+            if (callTimeoutMillis == null) {
+                callTimeoutMillis = 0L;
+            }
+
             if (maxIdleConnections == null) {
                 maxIdleConnections = DEFAULT_MAX_IDLE_CONNECTIONS;
             }

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

@@ -63,6 +63,7 @@ private OkHttpClient createOkHttpClient(CommunicationConfig config) {
                 .readTimeout(config.getReadTimeoutMillis(), TimeUnit.MILLISECONDS)
                 .writeTimeout(config.getWriteTimeoutMillis(), TimeUnit.MILLISECONDS)
                 .connectTimeout(config.getConnectionTimeoutMillis(), TimeUnit.MILLISECONDS)
+                .callTimeout(config.getCallTimeoutMillis(), TimeUnit.MILLISECONDS)
                 .connectionPool(new ConnectionPool(config.getMaxIdleConnections(),
                         config.getKeepAliveDurationMillis(), TimeUnit.MILLISECONDS))
                 .build();

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

@@ -1,8 +1,6 @@
 package com.taboola.rest.api.internal.config;
 
 
-import java.util.Collection;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.taboola.rest.api.exceptions.factories.ExceptionFactory;
 import com.taboola.rest.api.internal.StringResponseFactories;
@@ -24,6 +22,7 @@ public class CommunicationConfig {
     private final long writeTimeoutMillis;
     private final int maxIdleConnections;
     private final long keepAliveDurationMillis;
+    private final long callTimeoutMillis;
     private final boolean debug;
     private final RequestHeadersSupplier requestHeadersSupplier;
     private final ExceptionFactory exceptionFactory;
@@ -33,7 +32,7 @@ public class CommunicationConfig {
     private final CommunicationInterceptor communicationInterceptor;
 
     public CommunicationConfig(String baseUrl, Long connectionTimeoutMillis, Long readTimeoutMillis,
-                               Long writeTimeoutMillis, Integer maxIdleConnections, Long keepAliveDurationMillis,
+                               Long writeTimeoutMillis, Integer maxIdleConnections, Long keepAliveDurationMillis, Long callTimeoutMillis,
                                RequestHeadersSupplier requestHeadersSupplier, boolean debug, ExceptionFactory exceptionFactory,
                                ObjectMapper objectMapper, StringResponseFactories stringResponseFactories, HttpLoggingLevel loggingLevel,
                                CommunicationInterceptor communicationInterceptor) {
@@ -44,6 +43,7 @@ public CommunicationConfig(String baseUrl, Long connectionTimeoutMillis, Long re
         this.maxIdleConnections = maxIdleConnections;
         this.keepAliveDurationMillis = keepAliveDurationMillis;
         this.requestHeadersSupplier = requestHeadersSupplier;
+        this.callTimeoutMillis = callTimeoutMillis;
         this.debug = debug;
         this.exceptionFactory = exceptionFactory;
         this.objectMapper = objectMapper;
@@ -76,6 +76,10 @@ public long getKeepAliveDurationMillis() {
         return keepAliveDurationMillis;
     }
 
+    public long getCallTimeoutMillis() {
+        return callTimeoutMillis;
+    }
+
     public RequestHeadersSupplier getRequestHeadersSupplier() {
         return requestHeadersSupplier;
     }
@@ -112,6 +116,7 @@ public String toString() {
                 ", readTimeoutMillis=" + readTimeoutMillis +
                 ", writeTimeoutMillis=" + writeTimeoutMillis +
                 ", maxIdleConnections=" + maxIdleConnections +
+                ", callTimeoutMillis=" + callTimeoutMillis +
                 ", keepAliveDurationMillis=" + keepAliveDurationMillis +
                 ", debug=" + debug +
                 ", requestHeadersSupplier=" + requestHeadersSupplier +

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

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