Constructor inject the jakarte ee ClientBuilder

[aai/rest-client.git] / src / main / java / org / onap / aai / restclient / rest / RestClientBuilder.java

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 (file)
--- 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";\r
     private static final String TRUST_STORE_PROPERTY = "javax.net.ssl.trustStore";\r
 \r
+    private final ClientBuilder builder;\r
+\r
     private boolean validateServerHostname;\r
     private boolean validateServerCertChain;\r
     private String clientCertFileName;\r
@@ -71,7 +73,8 @@ public class RestClientBuilder {
     /**\r
      * Rest Client Builder.\r
      */\r
-    public RestClientBuilder() {\r
+    public RestClientBuilder(ClientBuilder builder) {\r
+        this.builder = builder;\r
         validateServerHostname = DEFAULT_VALIDATE_SERVER_HOST;\r
         validateServerCertChain = DEFAULT_VALIDATE_CERT_CHAIN;\r
         clientCertFileName = DEFAULT_CLIENT_CERT_FILENAME;\r
@@ -239,7 +242,7 @@ public class RestClientBuilder {
     protected Client getClient(boolean useSsl) throws Exception {\r
 \r
         // Finally, create and initialize our client...\r
-        ClientBuilder builder = ClientBuilder.newBuilder();\r
+        \r
         if (useSsl) {\r
             setupSecureSocketLayerClientConfig(builder);\r
         }\r