// 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 java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Optional;

/**
 * Utility class for retrieving {@link TransportSecurityOptions} from the system.
 *
 * @author bjorncs
 */
public class TransportSecurityUtils {

    public static final String CONFIG_FILE_ENVIRONMENT_VARIABLE = "VESPA_TLS_CONFIG_FILE";
    public static final String INSECURE_MIXED_MODE_ENVIRONMENT_VARIABLE = "VESPA_TLS_INSECURE_MIXED_MODE";
    public static final String INSECURE_AUTHORIZATION_MODE_ENVIRONMENT_VARIABLE = "VESPA_TLS_INSECURE_AUTHORIZATION_MODE";

    private TransportSecurityUtils() {}

    public static boolean isTransportSecurityEnabled() {
        return getConfigFile().isPresent();
    }

    public static MixedMode getInsecureMixedMode() {
        return getEnvironmentVariable(INSECURE_MIXED_MODE_ENVIRONMENT_VARIABLE)
                .map(MixedMode::fromConfigValue)
                .orElse(MixedMode.defaultValue());
    }

    public static AuthorizationMode getInsecureAuthorizationMode() {
        return getEnvironmentVariable(INSECURE_AUTHORIZATION_MODE_ENVIRONMENT_VARIABLE)
                .map(AuthorizationMode::fromConfigValue)
                .orElse(AuthorizationMode.defaultValue());
    }

    public static Optional<Path> getConfigFile() {
        return getEnvironmentVariable(CONFIG_FILE_ENVIRONMENT_VARIABLE).map(Paths::get);
    }

    public static Optional<TransportSecurityOptions> getOptions() {
        return getConfigFile()
                .map(TransportSecurityOptions::fromJsonFile);
    }

    public static Optional<TlsContext> createTlsContext() {
        return getConfigFile()
                .map(configFile -> new ReloadingTlsContext(configFile, getInsecureAuthorizationMode()));
    }

    private static Optional<String> getEnvironmentVariable(String environmentVariable) {
        return Optional.ofNullable(System.getenv(environmentVariable))
                .filter(var -> !var.isEmpty());
    }
}

@@ -145,16 +145,113 @@
 y.tls;%0A%0A
+import com.yahoo.security.tls.https.TlsAwareHttpClientBuilder;%0A%0Aimport java.net.http.HttpClient;%0A
 import j
@@ -1981,24 +1981,311 @@
 )));%0A    %7D%0A%0A
+    public static HttpClient.Builder createHttpClientBuilder(String userAgent) %7B%0A        return createTlsContext()%0A                .map(tlsContext -%3E new TlsAwareHttpClientBuilder(tlsContext, userAgent))%0A                .orElseGet(() -%3E new TlsAwareHttpClientBuilder(userAgent));%0A    %7D%0A%0A
     private 

Add utility method to construct http client