#59 - Add support for setting connection timeout on the Builder

Author: rbygrave

client/src/main/java/io/avaje/http/client/DBaseBuilder.java

@@ -23,6 +23,7 @@ abstract class DBaseBuilder {
   java.net.http.HttpClient client;
   String baseUrl;
   boolean requestLogging = true;
+  Duration connectionTimeout = Duration.ofSeconds(20);
   Duration requestTimeout = Duration.ofSeconds(20);
   BodyAdapter bodyAdapter;
   RetryHandler retryHandler;
@@ -92,9 +93,9 @@ private RequestIntercept buildIntercept() {
   }
 
   private java.net.http.HttpClient defaultClient() {
-    final java.net.http.HttpClient.Builder builder = java.net.http.HttpClient.newBuilder()
+    final var builder = java.net.http.HttpClient.newBuilder()
       .followRedirects(redirect)
-      .connectTimeout(Duration.ofSeconds(20));
+      .connectTimeout(connectionTimeout);
     if (cookieHandler != null) {
       builder.cookieHandler(cookieHandler);
     }

client/src/main/java/io/avaje/http/client/DHttpClientBuilder.java

@@ -27,6 +27,12 @@ public HttpClient.Builder baseUrl(String baseUrl) {
     return this;
   }
 
+  @Override
+  public HttpClient.Builder connectionTimeout(Duration connectionTimeout) {
+    this.connectionTimeout = connectionTimeout;
+    return this;
+  }
+
   @Override
   public HttpClient.Builder requestTimeout(Duration requestTimeout) {
     this.requestTimeout = requestTimeout;

client/src/main/java/io/avaje/http/client/DHttpClientContextBuilder.java

@@ -28,6 +28,12 @@ public HttpClientContext.Builder baseUrl(String baseUrl) {
     return this;
   }
 
+  @Override
+  public HttpClientContext.Builder connectionTimeout(Duration connectionTimeout) {
+    this.connectionTimeout = connectionTimeout;
+    return this;
+  }
+
   @Override
   public HttpClientContext.Builder requestTimeout(Duration requestTimeout) {
     this.requestTimeout = requestTimeout;

client/src/main/java/io/avaje/http/client/HttpClient.java

@@ -125,6 +125,13 @@ interface Builder {
      */
     Builder baseUrl(String baseUrl);
 
+    /**
+     * Set the connection timeout to use.
+     *
+     * @see java.net.http.HttpClient.Builder#connectTimeout(Duration)
+     */
+    Builder connectionTimeout(Duration connectionTimeout);
+
     /**
      * Set the default request timeout.
      *

client/src/main/java/io/avaje/http/client/HttpClientContext.java

@@ -102,6 +102,13 @@ interface Builder {
      */
     Builder baseUrl(String baseUrl);
 
+    /**
+     * Set the connection timeout to use.
+     *
+     * @see java.net.http.HttpClient.Builder#connectTimeout(Duration)
+     */
+    Builder connectionTimeout(Duration connectionTimeout);
+
     /**
      * Set the default request timeout.
      *

client/src/test/java/io/avaje/http/client/BaseWebTest.java

@@ -6,6 +6,8 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 
+import java.time.Duration;
+
 public class BaseWebTest {
 
   static Javalin webServer;
@@ -26,6 +28,8 @@ public static void shutdown() {
   public static HttpClientContext client() {
     return HttpClientContext.builder()
       .baseUrl(baseUrl)
+      .connectionTimeout(Duration.ofSeconds(1))
+      .requestTimeout(Duration.ofSeconds(1))
       .bodyAdapter(new JacksonBodyAdapter(new ObjectMapper()))
       .build();
   }

client/src/test/java/io/avaje/http/client/HelloControllerTest.java

@@ -36,6 +36,7 @@ class HelloControllerTest extends BaseWebTest {
   void newClientTest() {
     HttpClient client = HttpClient.builder()
       .baseUrl("http://localhost:8887")
+      .connectionTimeout(Duration.ofSeconds(1))
       .bodyAdapter(new JacksonBodyAdapter())
       .build();