Removed configuration from DefaultSettingsClient

Author: pc9795

src/main/java/com/exceptionless/exceptionlessclient/configuration/ConfigurationManager.java

@@ -114,7 +114,11 @@ public ConfigurationManager(
         SettingsManager.builder()
             .settingsClient(
                 settingsClient == null
-                    ? DefaultSettingsClient.builder().configuration(this.configuration).build()
+                    ? DefaultSettingsClient.builder()
+                        .configServerUrl(this.configServerUrl)
+                        .settingsClientTimeoutInMillis(this.settingsClientTimeoutInMillis)
+                        .apiKey(this.apiKey)
+                        .build()
                     : settingsClient)
             .storageProvider(this.storageProvider)
             .build();
@@ -185,8 +189,7 @@ private void addPropertyChangeListeners() {
   }
 
   private void checkApiKeyIsValid() {
-    if (configuration.getApiKey() != null
-        && configuration.getApiKey().length() >= API_KEY_MIN_LENGTH) {
+    if (this.apiKey.get() != null && this.apiKey.get().length() >= API_KEY_MIN_LENGTH) {
       return;
     }
 

src/main/java/com/exceptionless/exceptionlessclient/settings/DefaultSettingsClient.java

@@ -1,6 +1,6 @@
 package com.exceptionless.exceptionlessclient.settings;
 
-import com.exceptionless.exceptionlessclient.configuration.Configuration;
+import com.exceptionless.exceptionlessclient.configuration.ValueProvider;
 import com.exceptionless.exceptionlessclient.utils.Utils;
 import com.exceptionless.exceptionlessclient.utils.VisibleForTesting;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -13,23 +13,33 @@
 import java.time.Duration;
 
 public class DefaultSettingsClient implements SettingsClientIF {
-  private final Configuration configuration;
-  private final OkHttpClient httpClient;
+  private final OkHttpClient defaultHttpClient;
+  private final ValueProvider<Integer> settingsClientTimeoutInMillis;
+  private final ValueProvider<String> configServerUrl;
+  private final ValueProvider<String> apiKey;
 
   @Builder
-  public DefaultSettingsClient(Configuration configuration) {
-    this.configuration = configuration;
-    this.httpClient =
-        new OkHttpClient()
-            .newBuilder()
-            .connectTimeout(Duration.ofMillis(configuration.getSettingsClientTimeoutInMillis()))
-            .build();
+  public DefaultSettingsClient(
+      ValueProvider<Integer> settingsClientTimeoutInMillis,
+      ValueProvider<String> configServerUrl,
+      ValueProvider<String> apiKey) {
+    this(
+        new OkHttpClient().newBuilder().build(),
+        settingsClientTimeoutInMillis,
+        configServerUrl,
+        apiKey);
   }
 
   @VisibleForTesting
-  DefaultSettingsClient(Configuration configuration, OkHttpClient httpClient) {
-    this.configuration = configuration;
-    this.httpClient = httpClient;
+  DefaultSettingsClient(
+      OkHttpClient defaultHttpClient,
+      ValueProvider<Integer> settingsClientTimeoutInMillis,
+      ValueProvider<String> configServerUrl,
+      ValueProvider<String> apiKey) {
+    this.defaultHttpClient = defaultHttpClient;
+    this.settingsClientTimeoutInMillis = settingsClientTimeoutInMillis;
+    this.configServerUrl = configServerUrl;
+    this.apiKey = apiKey;
   }
 
   @Override
@@ -40,11 +50,17 @@ public SettingsResponse getSettings(long version) {
               .url(
                   String.format(
                       "%s/api/v2/projects/config?v=%s&access_token=%s",
-                      configuration.getConfigServerUrl(), version, configuration.getApiKey()))
+                      configServerUrl.get(), version, apiKey.get()))
               .get()
               .build();
 
-      Response response = httpClient.newCall(request).execute();
+      Response response =
+          defaultHttpClient
+              .newBuilder()
+              .connectTimeout(Duration.ofMillis(settingsClientTimeoutInMillis.get()))
+              .build()
+              .newCall(request)
+              .execute();
 
       ResponseBody body = response.body();
       String bodyStr = body == null ? null : body.string();

src/test/java/com/exceptionless/exceptionlessclient/settings/DefaultSettingsClientTest.java

@@ -1,15 +1,16 @@
 package com.exceptionless.exceptionlessclient.settings;
 
-import com.exceptionless.exceptionlessclient.TestFixtures;
-import com.exceptionless.exceptionlessclient.configuration.Configuration;
+import com.exceptionless.exceptionlessclient.configuration.ValueProvider;
 import okhttp3.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.io.IOException;
+import java.time.Duration;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -27,20 +28,24 @@ public class DefaultSettingsClientTest {
 
   @BeforeEach
   public void setup() {
-    Configuration configuration =
-        TestFixtures.aDefaultConfiguration()
-            .serverUrl("http://test-server-url")
-            .apiKey("test-api-key")
-            .settingsClientTimeoutInMillis(10)
-            .build();
-    settingsClient = new DefaultSettingsClient(configuration, httpClient);
+    settingsClient =
+        new DefaultSettingsClient(
+            httpClient,
+            ValueProvider.of(10),
+            ValueProvider.of("http://test-server-url"),
+            ValueProvider.of("test-api-key"));
     responseBuilder =
         new Response.Builder()
             .request(new Request.Builder().url("http://test-url").build())
             .protocol(Protocol.HTTP_2)
             .message("test-message")
             .body(ResponseBody.create("test-body", MediaType.get("text/plain")))
             .code(200);
+
+    OkHttpClient.Builder mockBuilder = Mockito.mock(OkHttpClient.Builder.class);
+    doReturn(mockBuilder).when(httpClient).newBuilder();
+    doReturn(mockBuilder).when(mockBuilder).connectTimeout(Duration.ofMillis(10));
+    doReturn(httpClient).when(mockBuilder).build();
   }
 
   @Test

src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

@@ -0,0 +1 @@
+mock-maker-inline