Full customization of shared client

Author: sgdesmet

src/main/java/com/whatsapp/api/WhatsappApiServiceGenerator.java

@@ -20,9 +20,9 @@
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
-import java.time.Duration;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 
 /**
  * The type Whatsapp api service generator.
@@ -81,7 +81,9 @@ public static OkHttpClient createDefaultHttpClient() {
      * @see <a
      * href="https://square.github.io/okhttp/4.x/okhttp/okhttp3/-ok-http-client/-builder/proxy-authenticator/">Proxy
      * Authenticator</a>
+     * @deprecated use {@link #customizeSharedClient(Consumer)}
      */
+    @Deprecated
     public static void setHttpProxy(String host, int port, String username, String pwd) {
         Objects.requireNonNull( host, "Host cannot be null" );
         CustomHttpProxySelector proxySelector = new CustomHttpProxySelector( host, port );
@@ -102,17 +104,11 @@ public static void setHttpProxy(String host, int port, String username, String p
                                    .build();
     }
 
-    public static void setTimeouts(final Duration callTimout, final Duration connectTimeout,
-                                   final Duration readTimeout) {
-
-        Objects.requireNonNull( callTimout, "Call duration cannot be null" );
-        Objects.requireNonNull( connectTimeout, "Connect duration cannot be null" );
-        Objects.requireNonNull( readTimeout, "Read duration cannot be null" );
-        sharedClient = sharedClient.newBuilder()
-                                   .callTimeout( callTimout )
-                                   .connectTimeout( connectTimeout )
-                                   .readTimeout( readTimeout )
-                                   .build();
+    public static void customizeSharedClient(Consumer<OkHttpClient.Builder> customizer){
+        Objects.requireNonNull( customizer, "Function required" );
+        var builder = sharedClient.newBuilder();
+        customizer.accept( builder );
+        sharedClient = builder.build();
     }
 
     /**

src/test/java/com/whatsapp/api/WhatsappApiServiceGeneratorTest.java

@@ -16,6 +16,7 @@
 import java.net.ProxySelector;
 import java.net.URISyntaxException;
 import java.time.Duration;
+import java.util.function.Consumer;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -120,22 +121,19 @@ void testSetHttpProxy_WithAuthentication() {
 
     /**
      * Method under test:
-     * {@link WhatsappApiServiceGenerator#setTimeouts(Duration, Duration, Duration)}
+     * {@link WhatsappApiServiceGenerator#customizeSharedClient(Consumer)}
      */
     @Test
-    void testSetTimeouts() {
+    void customizeSharedClient() {
 
         assertEquals( 20 * 1000, WhatsappApiServiceGenerator.getSharedClient().callTimeoutMillis() );
 
         // Set timeout in shared client
-        WhatsappApiServiceGenerator.setTimeouts( Duration.ofMinutes( 1L ), Duration.ofMinutes( 2L ), Duration.ofMinutes( 3L ) );
+        WhatsappApiServiceGenerator.customizeSharedClient(
+                builder -> builder.callTimeout( Duration.ofMinutes( 1L ) ) );
 
         // Check if timeout is set
         assertEquals( 60 * 1000, WhatsappApiServiceGenerator.getSharedClient().callTimeoutMillis() );
-
-        assertEquals( 2 * 60 * 1000, WhatsappApiServiceGenerator.getSharedClient().connectTimeoutMillis() );
-
-        assertEquals( 3 * 60 * 1000, WhatsappApiServiceGenerator.getSharedClient().readTimeoutMillis() );
     }
 
 }