Updated timeout computation.

Author: bfg

Diff for: extras/retrofit2/src/main/java/org/asynchttpclient/extras/retrofit/AsyncHttpClientCall.java

@@ -183,7 +183,7 @@ public Timeout timeout() {
    */
   protected long getRequestTimeoutMillis() {
     val config = getHttpClient().getConfig();
-    val timeout = Math.max(config.getReadTimeout(), config.getRequestTimeout());
+    val timeout = Math.min(config.getReadTimeout(), config.getRequestTimeout());
     return (timeout < 1) ? DEFAULT_EXECUTE_TIMEOUT_MILLIS : timeout;
   }
 

Diff for: extras/retrofit2/src/test/java/org/asynchttpclient/extras/retrofit/AsyncHttpClientCallTest.java

@@ -14,16 +14,13 @@
 
 import io.netty.handler.codec.http.DefaultHttpHeaders;
 import io.netty.handler.codec.http.EmptyHttpHeaders;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
-import lombok.val;
-import okhttp3.MediaType;
-import okhttp3.Request;
-import okhttp3.RequestBody;
+import okhttp3.*;
 import org.asynchttpclient.AsyncCompletionHandler;
 import org.asynchttpclient.AsyncHttpClient;
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.BoundRequestBuilder;
-import org.asynchttpclient.DefaultAsyncHttpClient;
 import org.asynchttpclient.DefaultAsyncHttpClientConfig;
 import org.asynchttpclient.Response;
 import org.mockito.ArgumentCaptor;
@@ -37,10 +34,8 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -339,18 +334,18 @@ void shouldReturnTimeoutSpecifiedInAHCInstanceConfig() {
         when(httpClient.getConfig()).thenReturn(config);
 
         // then
-        assertEquals(call.getRequestTimeoutMillis(), SECONDS.toMillis(6));
-        assertEquals(call.timeout().timeoutNanos(), SECONDS.toNanos(6));
+        assertEquals(call.getRequestTimeoutMillis(), SECONDS.toMillis(5));
+        assertEquals(call.timeout().timeoutNanos(), SECONDS.toNanos(5));
 
         // when: set read timeout to 10 seconds, req timeout to 7s
         config = cfgBuilder.setReadTimeout((int) SECONDS.toMillis(10))
                 .setRequestTimeout((int) SECONDS.toMillis(7))
                 .build();
         when(httpClient.getConfig()).thenReturn(config);
 
-        // then:
-        assertEquals(call.getRequestTimeoutMillis(), SECONDS.toMillis(10));
-        assertEquals(call.timeout().timeoutNanos(), SECONDS.toNanos(10));
+        // then: request timeout is considered by AHC if read timeout is bigger than request timeout
+        assertEquals(call.getRequestTimeoutMillis(), SECONDS.toMillis(7));
+        assertEquals(call.timeout().timeoutNanos(), SECONDS.toNanos(7));
     }
 
     private void givenResponseIsProduced(AsyncHttpClient client, Response response) {