Removed configuration from DefaultSubmissionClient

Author: pc9795

pom.xml

@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.21.0</version>
+            <version>2.25.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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

@@ -127,7 +127,10 @@ public ConfigurationManager(
         submissionClient == null
             ? DefaultSubmissionClient.builder()
                 .settingsManager(this.settingsManager)
-                .configuration(this.configuration)
+                .submissionClientTimeoutInMillis(this.submissionClientTimeoutInMillis)
+                .serverUrl(this.serverUrl)
+                .apiKey(this.apiKey)
+                .heartbeatServerUrl(this.heartbeatServerUrl)
                 .build()
             : submissionClient;
     this.queue =
@@ -194,7 +197,7 @@ private void checkApiKeyIsValid() {
     }
 
     throw new InvalidApiKeyException(
-        String.format("Apikey is not valid: [%s]", this.configuration.getApiKey()));
+        String.format("Apikey is not valid: [%s]", this.apiKey.get()));
   }
 
   private void addLogCapturer(LogCapturerIF logCatpurer) {

src/main/java/com/exceptionless/exceptionlessclient/submission/DefaultSubmissionClient.java

@@ -1,6 +1,6 @@
 package com.exceptionless.exceptionlessclient.submission;
 
-import com.exceptionless.exceptionlessclient.configuration.Configuration;
+import com.exceptionless.exceptionlessclient.configuration.ValueProvider;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.UserDescription;
 import com.exceptionless.exceptionlessclient.settings.SettingsManager;
@@ -21,35 +21,49 @@ public class DefaultSubmissionClient implements SubmissionClientIF {
   private static final String CONFIGURATION_VERSION_HEADER = "x-exceptionless-configversion";
   private static final String RATE_LIMITING_HEADER = "x-ratelimit-remaining";
 
-  private final Configuration configuration;
   private final SettingsManager settingsManager;
-  private final OkHttpClient httpClient;
+  private final OkHttpClient defaultHttpClient;
+  private final ValueProvider<Integer> submissionClientTimeoutInMillis;
+  private final ValueProvider<String> serverUrl;
+  private final ValueProvider<String> apiKey;
+  private final ValueProvider<String> heartbeatServerUrl;
 
   @Builder
-  public DefaultSubmissionClient(Configuration configuration, SettingsManager settingsManager) {
-    this.configuration = configuration;
-    this.settingsManager = settingsManager;
-    this.httpClient =
-        new OkHttpClient()
-            .newBuilder()
-            .connectTimeout(Duration.ofMillis(configuration.getSubmissionClientTimeoutInMillis()))
-            .build();
+  public DefaultSubmissionClient(
+      SettingsManager settingsManager,
+      ValueProvider<Integer> submissionClientTimeoutInMillis,
+      ValueProvider<String> serverUrl,
+      ValueProvider<String> apiKey,
+      ValueProvider<String> heartbeatServerUrl) {
+    this(
+        new OkHttpClient().newBuilder().build(),
+        settingsManager,
+        submissionClientTimeoutInMillis,
+        serverUrl,
+        apiKey,
+        heartbeatServerUrl);
   }
 
   @VisibleForTesting
   DefaultSubmissionClient(
-      Configuration configuration, SettingsManager settingsManager, OkHttpClient httpClient) {
-    this.configuration = configuration;
+      OkHttpClient defaultHttpClient,
+      SettingsManager settingsManager,
+      ValueProvider<Integer> submissionClientTimeoutInMillis,
+      ValueProvider<String> serverUrl,
+      ValueProvider<String> apiKey,
+      ValueProvider<String> heartbeatServerUrl) {
     this.settingsManager = settingsManager;
-    this.httpClient = httpClient;
+    this.defaultHttpClient = defaultHttpClient;
+    this.submissionClientTimeoutInMillis = submissionClientTimeoutInMillis;
+    this.serverUrl = serverUrl;
+    this.apiKey = apiKey;
+    this.heartbeatServerUrl = heartbeatServerUrl;
   }
 
   @Override
   public SubmissionResponse postEvents(List<Event> events) {
     return postSubmission(
-        String.format(
-            "%s/api/v2/events?access_token=%s",
-            configuration.getServerUrl(), configuration.getApiKey()),
+        String.format("%s/api/v2/events?access_token=%s", serverUrl.get(), apiKey.get()),
         events.stream().map(SubmissionMapper::toRequest).collect(Collectors.toList()));
   }
 
@@ -58,7 +72,7 @@ public SubmissionResponse postUserDescription(String referenceId, UserDescriptio
     return postSubmission(
         String.format(
             "%s/api/v2/events/by-ref/%s/user-description?access_token=%s",
-            configuration.getServerUrl(), referenceId, configuration.getApiKey()),
+            serverUrl.get(), referenceId, apiKey.get()),
         SubmissionMapper.toRequest(description));
   }
 
@@ -71,7 +85,13 @@ private SubmissionResponse postSubmission(String url, Object data) {
               .post(RequestBody.create(requestJSON, MediaType.parse("application/json")))
               .build();
 
-      Response response = httpClient.newCall(request).execute();
+      Response response =
+          defaultHttpClient
+              .newBuilder()
+              .connectTimeout(Duration.ofMillis(submissionClientTimeoutInMillis.get()))
+              .build()
+              .newCall(request)
+              .execute();
 
       if (response.isSuccessful()) {
         updateSettingsFromHeaders(response);
@@ -109,14 +129,20 @@ public void sendHeartBeat(String sessionIdOrUserId, boolean closeSession) {
               .url(
                   String.format(
                       "%s/api/v2/events/session/heartbeat?id=%s&close=%s&access_token=%s",
-                      configuration.getHeartbeatServerUrl(),
+                      heartbeatServerUrl.get(),
                       URLEncoder.encode(sessionIdOrUserId, StandardCharsets.UTF_8),
                       closeSession,
-                      configuration.getApiKey()))
+                      apiKey.get()))
               .get()
               .build();
 
-      Response response = httpClient.newCall(request).execute();
+      Response response =
+          defaultHttpClient
+              .newBuilder()
+              .connectTimeout(Duration.ofMillis(submissionClientTimeoutInMillis.get()))
+              .build()
+              .newCall(request)
+              .execute();
 
       if (!response.isSuccessful()) {
         log.error(

src/test/java/com/exceptionless/exceptionlessclient/TestFixtures.java

@@ -15,6 +15,7 @@ public static Configuration.ConfigurationBuilder aDefaultConfiguration() {
 
   public static ConfigurationManager.ConfigurationManagerBuilder aDefaultConfigurationManager() {
     return ConfigurationManager.builder()
+        .apiKey("12456790abcdef")
         .configuration(aDefaultConfiguration().build())
         .queue(Mockito.mock(DefaultEventQueue.class))
         .storageProvider(InMemoryStorageProvider.builder().build());

src/test/java/com/exceptionless/exceptionlessclient/configuration/ConfigurationManagerTest.java

@@ -55,7 +55,7 @@ public void itThrowsInvalidApiKeyExceptionForInvalidApiKeys() {
     assertThatThrownBy(
             () ->
                 TestFixtures.aDefaultConfigurationManager()
-                    .configuration(Configuration.builder().apiKey("xxx").build())
+                    .apiKey("xxx")
                     .build())
         .isInstanceOf(InvalidApiKeyException.class)
         .hasMessage("Apikey is not valid: [xxx]");
@@ -192,7 +192,7 @@ public void itCanUseSessions() {
   @Test
   public void itCanDetectChanges() {
     configurationManager.onChanged(handler);
-    configurationManager.getConfiguration().setApiKey("test-api-key");
+    configurationManager.setApiKey("test-api-key");
 
     verify(handler, times(1)).accept(configurationManager);
   }

src/test/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/ConfigurationDefaultsPluginTest.java

@@ -1,6 +1,5 @@
 package com.exceptionless.exceptionlessclient.plugins.preconfigured;
 
-import com.exceptionless.exceptionlessclient.configuration.Configuration;
 import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
@@ -22,10 +21,7 @@ public class ConfigurationDefaultsPluginTest {
   public void setup() {
     plugin = ConfigurationDefaultsPlugin.builder().build();
     context = EventPluginContext.from(Event.builder().build());
-    configurationManager =
-        ConfigurationManager.builder()
-            .configuration(Configuration.builder().apiKey("12456790abcdef").build())
-            .build();
+    configurationManager = ConfigurationManager.builder().apiKey("12456790abcdef").build();
   }
 
   @Test

src/test/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/DuplicateCheckerPluginTest.java

@@ -1,6 +1,5 @@
 package com.exceptionless.exceptionlessclient.plugins.preconfigured;
 
-import com.exceptionless.exceptionlessclient.TestFixtures;
 import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
 import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
 import com.exceptionless.exceptionlessclient.models.Event;
@@ -46,10 +45,7 @@ public void setup() {
                 .count(EVENT_COUNT)
                 .build());
     configurationManager =
-        ConfigurationManager.builder()
-            .configuration(TestFixtures.aDefaultConfiguration().build())
-            .queue(eventQueue)
-            .build();
+        ConfigurationManager.builder().apiKey("12456790abcdef").queue(eventQueue).build();
   }
 
   @Test

src/test/java/com/exceptionless/exceptionlessclient/submission/DefaultSubmissionClientTest.java

@@ -1,7 +1,6 @@
 package com.exceptionless.exceptionlessclient.submission;
 
-import com.exceptionless.exceptionlessclient.TestFixtures;
-import com.exceptionless.exceptionlessclient.configuration.Configuration;
+import com.exceptionless.exceptionlessclient.configuration.ValueProvider;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.UserDescription;
 import com.exceptionless.exceptionlessclient.settings.SettingsManager;
@@ -10,9 +9,11 @@
 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.List;
 import java.util.Map;
 
@@ -31,22 +32,25 @@ public class DefaultSubmissionClientTest {
 
   @BeforeEach
   public void setup() {
-    Configuration configuration =
-        TestFixtures.aDefaultConfiguration()
-            .serverUrl("http://test-server-url")
-            .heartbeatServerUrl("http://test-heartbeat-server-url")
-            .apiKey("test-api-key")
-            .submissionClientTimeoutInMillis(10)
-            .build();
-
-    submissionClient = new DefaultSubmissionClient(configuration, settingsManager, httpClient);
+    submissionClient =
+        new DefaultSubmissionClient(
+            httpClient,
+            settingsManager,
+            ValueProvider.of(10),
+            ValueProvider.of("http://test-server-url"),
+            ValueProvider.of("test-api-key"),
+            ValueProvider.of("http://test-heartbeat-server-url"));
     responseBuilder =
         new Response.Builder()
             .request(new Request.Builder().url("http://test-url").build())
             .protocol(Protocol.HTTP_2)
             .body(ResponseBody.create("test-body", MediaType.get("text/plain")))
             .message("test-message")
             .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
@@ -174,7 +178,9 @@ public void itCanHandleAllExceptionsWhilePostingUserDescription() {
     Exception exception = new RuntimeException("test");
     doThrow(exception).when(httpClient).newCall(any());
 
-    SubmissionResponse response = submissionClient.postUserDescription("test-reference-id", UserDescription.builder().build());
+    SubmissionResponse response =
+        submissionClient.postUserDescription(
+            "test-reference-id", UserDescription.builder().build());
 
     assertThat(response.hasException()).isTrue();
     assertThat(response.getException()).isSameAs(exception);