Revert "Jonmv/remove last controller jersey client [run-systemtest]"

1 files changed, 0 insertions, 49 deletions

diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc5/DefaultHttpClientBuilder.java b/http-utils/src/main/java/ai/vespa/util/http/hc5/DefaultHttpClientBuilder.java
deleted file mode 100644
index 8ad9d63cd1a..00000000000
--- a/http-utils/src/main/java/ai/vespa/util/http/hc5/DefaultHttpClientBuilder.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package ai.vespa.util.http.hc5;
-
-import org.apache.hc.client5.http.config.RequestConfig;
-import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
-import org.apache.hc.client5.http.impl.classic.HttpClients;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
-import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
-import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.util.Timeout;
-
-import javax.net.ssl.SSLContext;
-import java.time.Duration;
-import java.util.Map;
-import java.util.function.Supplier;
-
-/**
- * Like {@link VespaHttpClientBuilder}, but with standard TLS based on provided SSL context.
- *
- * @author jonmv
- */
-public class DefaultHttpClientBuilder {
-
-    public static final Duration connectTimeout = Duration.ofSeconds(5);
-    public static final Duration socketTimeout = Duration.ofSeconds(5);
-
-    private DefaultHttpClientBuilder() { }
-
-    public static HttpClientBuilder create(SSLContext sslContext, String userAgent) {
-        return create(() -> sslContext, userAgent);
-    }
-
-    /** Creates an HTTP client builder with the given SSL context, and using the provided timeouts for requests where config is not overridden. */
-    public static HttpClientBuilder create(Supplier<SSLContext> sslContext, String userAgent) {
-        return HttpClientBuilder.create()
-                                .setConnectionManager(PoolingHttpClientConnectionManagerBuilder
-                                                              .create()
-                                                              .setSSLSocketFactory(SSLConnectionSocketFactoryBuilder
-                                                                                           .create()
-                                                                                           .setSslContext(sslContext.get())
-                                                                                           .build())
-                                                              .build())
-                                .setUserAgent(userAgent)
-                                .disableCookieManagement()
-                                .disableAutomaticRetries()
-                                .disableAuthCaching();
-    }
-
-}