From 358c5690065056af8eb840c4f1b2ce6a9311d7f1 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Fri, 5 Apr 2019 01:13:07 +0200 Subject: Revert "Remove TlsAwareHttpClientBuilder" This reverts commit e962344ba28b9f84028a129a24c92b40fdc076b8. --- .../main/java/com/yahoo/security/tls/TransportSecurityUtils.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java') diff --git a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java index f5f9182fc4e..2ea1e1efe83 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java @@ -1,6 +1,9 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.security.tls; +import com.yahoo.security.tls.https.TlsAwareHttpClientBuilder; + +import java.net.http.HttpClient; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Optional; @@ -48,6 +51,12 @@ public class TransportSecurityUtils { .map(configFile -> new ReloadingTlsContext(configFile, getInsecureAuthorizationMode())); } + public static HttpClient.Builder createHttpClientBuilder(String userAgent) { + return createTlsContext() + .map(tlsContext -> new TlsAwareHttpClientBuilder(tlsContext, userAgent)) + .orElseGet(() -> new TlsAwareHttpClientBuilder(userAgent)); + } + private static Optional getEnvironmentVariable(String environmentVariable) { return Optional.ofNullable(System.getenv(environmentVariable)) .filter(var -> !var.isEmpty()); -- cgit v1.2.3