X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Frest-client.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Frestclient%2Frest%2FRestClientBuilder.java;h=bfd44c63f80f9468c91847b60263a4526a373cf1;hp=38a855817a0df7beb8607a45c9cf54eaf5169b75;hb=refs%2Fheads%2Fmaster;hpb=338ea513407cac56c78678f6697a2e55b6bc22b9 diff --git a/src/main/java/org/onap/aai/restclient/rest/RestClientBuilder.java b/src/main/java/org/onap/aai/restclient/rest/RestClientBuilder.java index 38a8558..bfd44c6 100644 --- a/src/main/java/org/onap/aai/restclient/rest/RestClientBuilder.java +++ b/src/main/java/org/onap/aai/restclient/rest/RestClientBuilder.java @@ -56,6 +56,8 @@ public class RestClientBuilder { private static final String KEYSTORE_TYPE = "PKCS12"; private static final String TRUST_STORE_PROPERTY = "javax.net.ssl.trustStore"; + private final ClientBuilder builder; + private boolean validateServerHostname; private boolean validateServerCertChain; private String clientCertFileName; @@ -71,7 +73,8 @@ public class RestClientBuilder { /** * Rest Client Builder. */ - public RestClientBuilder() { + public RestClientBuilder(ClientBuilder builder) { + this.builder = builder; validateServerHostname = DEFAULT_VALIDATE_SERVER_HOST; validateServerCertChain = DEFAULT_VALIDATE_CERT_CHAIN; clientCertFileName = DEFAULT_CLIENT_CERT_FILENAME; @@ -239,7 +242,7 @@ public class RestClientBuilder { protected Client getClient(boolean useSsl) throws Exception { // Finally, create and initialize our client... - ClientBuilder builder = ClientBuilder.newBuilder(); + if (useSsl) { setupSecureSocketLayerClientConfig(builder); }