Constructor inject the jakarte ee ClientBuilderHEADmaster

- do not create the ClientBuilder inside the classes but rather constructor inject it
- this way instrumentation of the client could be possible when tracing is enabled

Issue-ID: AAI-3817
Change-Id: I4c6d1faf8da98283e8bbae66bd0b3207786a4ce5
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

2 files changed, 8 insertions, 4 deletions

diff --git a/src/main/java/org/onap/aai/restclient/client/RestClient.java b/src/main/java/org/onap/aai/restclient/client/RestClient.java
index 9639c9d..0bdb177 100644
--- a/src/main/java/org/onap/aai/restclient/client/RestClient.java
+++ b/src/main/java/org/onap/aai/restclient/client/RestClient.java
@@ -33,6 +33,7 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
 
 import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Invocation.Builder;
 import javax.ws.rs.client.WebTarget;
@@ -98,8 +99,8 @@ public class RestClient {
     /**
      * Creates a new instance of the {@link RestClient}.
      */
-    public RestClient() {
-        clientBuilder = new RestClientBuilder();
+    public RestClient(ClientBuilder builder) {
+        clientBuilder = new RestClientBuilder(builder);
     }
 
     /**
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);

         }