Migrate jetty-client to vertx-web-client

pom.xml

@@ -267,9 +267,8 @@
             <version>3.3.4</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-client</artifactId>
-            <version>${jetty.version}</version>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-web-client</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.transaction</groupId>

src/main/java/ai/labs/eddi/engine/httpclient/IHttpClient.java

@@ -1,7 +1,5 @@
 package ai.labs.eddi.engine.httpclient;
 
-import org.eclipse.jetty.http.HttpCookieStore;
-
 import java.net.URI;
 
 public interface IHttpClient {
@@ -14,8 +12,6 @@ enum Method {
         PATCH
     }
 
-    HttpCookieStore getCookieStore();
-
     IRequest newRequest(URI uri);
 
     IRequest newRequest(URI uri, Method method);

src/main/java/ai/labs/eddi/engine/httpclient/bootstrap/HttpClientModule.java

@@ -1,73 +1,57 @@
 package ai.labs.eddi.engine.httpclient.bootstrap;
 
-import ai.labs.eddi.engine.httpclient.impl.JettyHttpClient;
+import ai.labs.eddi.engine.httpclient.impl.VertxHttpClient;
+import io.vertx.core.Vertx;
+import io.vertx.ext.web.client.WebClient;
+import io.vertx.ext.web.client.WebClientSession;
+import io.vertx.ext.web.client.WebClientOptions;
 import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Disposes;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Produces;
-import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.WWWAuthenticationProtocolHandler;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.eclipse.microprofile.context.ManagedExecutor;
-
-import java.util.Arrays;
 
 @ApplicationScoped
 public class HttpClientModule {
 
     @Inject
-    ManagedExecutor executorService;
+    Vertx vertx;
 
     @Produces
     @ApplicationScoped
-    public JettyHttpClient provideHttpClient(@ConfigProperty(name = "httpClient.maxConnectionsQueued") Integer maxConnectionsQueued,
-                                             @ConfigProperty(name = "httpClient.maxConnectionPerRoute") Integer maxConnectionPerRoute,
-                                             @ConfigProperty(name = "httpClient.requestBufferSize") Integer requestBufferSize,
-                                             @ConfigProperty(name = "httpClient.responseBufferSize") Integer responseBufferSize,
+    public VertxHttpClient provideHttpClient(@ConfigProperty(name = "httpClient.maxConnectionPerRoute") Integer maxConnectionPerRoute,
                                              @ConfigProperty(name = "httpClient.maxRedirects") Integer maxRedirects,
                                              @ConfigProperty(name = "httpClient.idleTimeoutInMillis") Integer idleTimeout,
-                                             @ConfigProperty(name = "httpClient.connectTimeoutInMillis") Integer connectTimeout,
-                                             @ConfigProperty(name = "httpClient.disableWWWAuthenticationValidation")
-                                             Boolean disableWWWAuthenticationValidation) {
+                                             @ConfigProperty(name = "httpClient.connectTimeoutInMillis") Integer connectTimeout) {
 
-        try {
-            HttpClient httpClient = new HttpClient();
-            httpClient.setExecutor(executorService);
-            httpClient.setMaxConnectionsPerDestination(maxConnectionsQueued);
-            httpClient.setMaxRequestsQueuedPerDestination(maxConnectionPerRoute);
-            httpClient.setRequestBufferSize(requestBufferSize);
-            httpClient.setResponseBufferSize(responseBufferSize);
-            httpClient.setMaxRedirects(maxRedirects);
-            httpClient.setIdleTimeout(idleTimeout);
-            httpClient.setConnectTimeout(connectTimeout);
-            httpClient.start();
+        WebClientOptions options = new WebClientOptions();
 
-            if (disableWWWAuthenticationValidation) {
-                httpClient.getProtocolHandlers().remove(WWWAuthenticationProtocolHandler.NAME);
-            }
+        // Mapping configuration
+        options.setMaxPoolSize(maxConnectionPerRoute);
 
-            registerHttpClientShutdownHook(httpClient);
+        options.setMaxRedirects(maxRedirects);
 
-            return new JettyHttpClient(httpClient);
-        } catch (Exception e) {
-            System.out.println(Arrays.toString(e.getStackTrace()));
-            throw new RuntimeException(e.getLocalizedMessage(), e);
+        int idleTimeoutSeconds;
+        if (idleTimeout == 0) {
+            idleTimeoutSeconds = 0;
+        } else {
+            idleTimeoutSeconds = (int) Math.ceil(idleTimeout / 1000.0);
         }
+        options.setIdleTimeout(idleTimeoutSeconds);
+
+        options.setConnectTimeout(connectTimeout);
+        options.setFollowRedirects(true);
+        options.setDecompressionSupported(true);
+
+        WebClient webClient = WebClient.create(vertx, options);
+        WebClientSession webClientSession = WebClientSession.create(webClient);
+
+        return new VertxHttpClient(vertx, webClientSession, webClient);
     }
 
-    private void registerHttpClientShutdownHook(final HttpClient httpClient) {
-        Runtime.getRuntime().addShutdownHook(new Thread("ShutdownHook_HttpClient") {
-            @Override
-            public void run() {
-                try {
-                    if (!httpClient.isStopped()) {
-                        httpClient.stop();
-                    }
-                } catch (Throwable e) {
-                    String message = "HttpClient did not stop as expected.";
-                    System.out.println(message);
-                    System.out.println(Arrays.toString(e.getStackTrace()));
-                }
-            }
-        });
+    public void close(@Disposes VertxHttpClient client) {
+        if (client.getUnderlyingClient() != null) {
+            client.getUnderlyingClient().close();
+        }
     }
 }