BingAds#203: separate implementations for Jersey and Cxf HttpClientProviders

Author: schabe77

Diff for: src/main/java/com/microsoft/bingads/CxfHttpClientProvider.java

@@ -0,0 +1,37 @@
+package com.microsoft.bingads;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.cxf.transport.common.gzip.GZIPFeature;
+
+import com.microsoft.bingads.internal.CxfUtils;
+
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+
+public class CxfHttpClientProvider extends HttpClientProvider {
+
+    protected CxfHttpClientProvider(ClientBuilder clientBuilder) {
+        super(configureClientBuilder(clientBuilder), CxfHttpClientProvider::createWebTargets);
+    }
+
+    private static ClientBuilder configureClientBuilder(ClientBuilder clientBuilder) {
+        return clientBuilder.register(new GZIPFeature());
+    }
+
+    private static Map<String, WebTarget> createWebTargets(Client client) {
+        return CxfUtils.runOnNewBus(
+                () -> initializeWebTargets(client),
+                logging -> {
+                    Set<String> headerNames = new HashSet<>();
+
+                    headerNames.add("Authorization");
+                    headerNames.add("Password");
+
+                    logging.setSensitiveProtocolHeaderNames(headerNames);
+                });
+    }
+}

Diff for: src/main/java/com/microsoft/bingads/GlobalSettings.java

@@ -3,23 +3,13 @@
 import com.microsoft.bingads.internal.utilities.Lazy;
 
 public class GlobalSettings {
-    private static Lazy<HttpClientProvider> lazyHttpClientProvider = new Lazy<>(() -> {
-        HttpClientProvider provider = new HttpClientProvider();
-
-        provider.initialize();
-
-        return provider;
-    });
+    private static Lazy<HttpClientProvider> lazyHttpClientProvider = new Lazy<>(HttpClientProviderFactory::getHttpClientProvider);
 
     public static HttpClientProvider getHttpClientProvider() {
         return lazyHttpClientProvider.getValue();
     }
 
     public static void setHttpClientProvider(HttpClientProvider httpClientProvider) {
-        lazyHttpClientProvider = new Lazy<>(() -> {
-            httpClientProvider.initialize();
-    
-            return httpClientProvider;
-        });
+        lazyHttpClientProvider = new Lazy<>(() -> httpClientProvider);
     }
 }

Diff for: src/main/java/com/microsoft/bingads/HttpClientProvider.java

@@ -4,82 +4,44 @@
 import java.net.URL;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.cxf.transport.common.gzip.GZIPFeature;
-
-import com.microsoft.bingads.internal.CxfUtils;
 import com.microsoft.bingads.internal.ServiceFactoryImpl;
 import com.microsoft.bingads.internal.ServiceInfo;
 import com.microsoft.bingads.internal.ServiceUtils;
+import com.microsoft.bingads.internal.functionalinterfaces.Function;
 
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;
 import jakarta.ws.rs.client.WebTarget;
 
 public class HttpClientProvider {
-    private Map<String, WebTarget> webTargetByService;
-
-    public void initialize() {
-        if (webTargetByService != null) {
-            return;
-        }
+    private final Client client;
+    private final Map<String, WebTarget> webTargetByService;
 
-        ClientBuilder clientBuilder = configureClientBuilder(ClientBuilder.newBuilder());
-
-        Client client = clientBuilder.build();
+    HttpClientProvider(ClientBuilder clientBuilder) {
+        this(clientBuilder, HttpClientProvider::initializeWebTargets);
+    }
 
-        webTargetByService = createWebTargets(client);
+    HttpClientProvider(ClientBuilder clientBuilder, Function<Client, Map<String, WebTarget>> webTargetByServiceFunction) {
+        client = clientBuilder.connectTimeout(1, TimeUnit.MINUTES)
+                .readTimeout(10, TimeUnit.MINUTES)
+                .build();
+        webTargetByService = webTargetByServiceFunction.apply(client);
     }
 
     public WebTarget get(Class<?> serviceInterface, ApiEnvironment environment) {
         String key = getKey(serviceInterface, environment);
-
         return webTargetByService.get(key);
     }
 
-    private static String getKey(Class<?> serviceInterface, ApiEnvironment environment) {
-        return serviceInterface.getName() + "_" + environment.toString();
+    protected void close() {
+        client.close();
     }
 
-    protected ClientBuilder configureClientBuilder(ClientBuilder clientBuilder) {
-        String clientClassName = clientBuilder.getClass().getName();
-        
-        if (clientClassName.contains("org.apache.cxf")) {
-            clientBuilder = clientBuilder.register(new GZIPFeature());
-        }
-        
-        if (clientClassName.contains("org.glassfish.jersey")) {
-            clientBuilder = clientBuilder.property("jersey.config.client.suppressHttpComplianceValidation", true); // allow DELETE requests with body
-        }
-
-        return clientBuilder
-            .connectTimeout(1, TimeUnit.MINUTES)
-            .readTimeout(10, TimeUnit.MINUTES);
-    }
-
-    protected Map<String, WebTarget> createWebTargets(Client client) {
-        boolean isCxf = client.getClass().getName().contains("org.apache.cxf");
-
-        if (isCxf) {
-            return CxfUtils.runOnNewBus(
-                () -> initializeWebTargets(client),
-                (logging) -> {
-                    Set<String> headerNames = new HashSet<>();
-
-                    headerNames.add("Authorization");
-                    headerNames.add("Password");
-
-                    logging.setSensitiveProtocolHeaderNames(headerNames);
-                }
-            );
-        }
-
-        return initializeWebTargets(client);
+    private static String getKey(Class<?> serviceInterface, ApiEnvironment environment) {
+        return serviceInterface.getName() + "_" + environment.toString();
     }
 
     protected static Map<String, WebTarget> initializeWebTargets(Client client) {

Diff for: src/main/java/com/microsoft/bingads/HttpClientProviderFactory.java

@@ -0,0 +1,20 @@
+package com.microsoft.bingads;
+
+import jakarta.ws.rs.client.ClientBuilder;
+
+public class HttpClientProviderFactory {
+
+    private HttpClientProviderFactory() {
+        // no instantiation necessary
+    }
+
+    public static HttpClientProvider getHttpClientProvider() {
+        ClientBuilder clientBuilder = ClientBuilder.newBuilder();
+        if (clientBuilder.getClass().getName().contains("org.apache.cxf")) {
+            return new CxfHttpClientProvider(clientBuilder);
+        } else if (clientBuilder.getClass().getName().contains("org.glassfish.jersey")) {
+            return new JerseyHttpClientProvider(clientBuilder);
+        }
+        return new HttpClientProvider(clientBuilder);
+    }
+}

Diff for: src/main/java/com/microsoft/bingads/JerseyHttpClientProvider.java

@@ -0,0 +1,15 @@
+package com.microsoft.bingads;
+
+import jakarta.ws.rs.client.ClientBuilder;
+
+public class JerseyHttpClientProvider extends HttpClientProvider {
+
+    protected JerseyHttpClientProvider(ClientBuilder clientBuilder) {
+        super(configureClientBuilder(clientBuilder));
+    }
+
+    private static ClientBuilder configureClientBuilder(ClientBuilder clientBuilder) {
+        // allow DELETE requests with body
+        return clientBuilder.property("jersey.config.client.suppressHttpComplianceValidation", true);
+    }
+}