diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-05-02 21:09:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-02 21:09:20 +0200 |
commit | e046ae79779261b09f85bcf4c04c906b83075775 (patch) | |
tree | f6983d307d0e84a1dbaeda89726dd8d53e55e927 /http-utils | |
parent | d2066c0a0c04e2aa2ada12a5c85f5eae9ff65b02 (diff) | |
parent | 6058f5f8d2ed19ca3c0461e7080680a093834823 (diff) |
Merge pull request #22394 from vespa-engine/revert-22374-jonmv/remove-last-controller-jersey-client
Revert "Jonmv/remove last controller jersey client [run-systemtest]"
Diffstat (limited to 'http-utils')
-rw-r--r-- | http-utils/src/main/java/ai/vespa/util/http/hc5/DefaultHttpClientBuilder.java | 49 |
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(); - } - -} |