Removed configuration from ConfigurationManager

Author: pc9795

src/main/java/com/exceptionless/exceptionlessclient/ExceptionlessClient.java

@@ -1,6 +1,5 @@
 package com.exceptionless.exceptionlessclient;
 
-import com.exceptionless.exceptionlessclient.configuration.Configuration;
 import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
 import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
 import com.exceptionless.exceptionlessclient.enums.EventType;
@@ -67,7 +66,7 @@ public void run() {
           }
         },
         delay,
-        configurationManager.getConfiguration().getUpdateSettingsWhenIdleInterval());
+        configurationManager.getUpdateSettingsWhenIdleInterval().get());
 
     configurationManager.onChanged(
         ignored -> configurationManager.getSettingsManager().updateSettings());
@@ -80,9 +79,7 @@ public void run() {
   public static ExceptionlessClient from(String apiKey, String serverUrl) {
     return ExceptionlessClient.builder()
         .configurationManager(
-            ConfigurationManager.builder()
-                .configuration(Configuration.builder().apiKey(apiKey).serverUrl(serverUrl).build())
-                .build())
+            ConfigurationManager.builder().apiKey(apiKey).serverUrl(serverUrl).build())
         .build();
   }
 

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

@@ -61,7 +61,6 @@ public static class Property {
   @Getter private final LastReferenceIdManagerIF lastReferenceIdManager;
   @Getter private final SubmissionClientIF submissionClient;
   @Getter private final EventQueueIF queue;
-  @Getter private final Configuration configuration;
   @Getter private final Set<String> defaultTags;
   @Getter private final Map<String, Object> defaultData;
   private final List<Consumer<ConfigurationManager>> onChangedHandlers;
@@ -89,7 +88,6 @@ public ConfigurationManager(
       SettingsClientIF settingsClient,
       StorageProviderIF storageProvider,
       EventQueueIF queue,
-      Configuration configuration,
       Integer maxQueueItems,
       Integer processingIntervalInSecs,
       String apiKey,
@@ -108,8 +106,6 @@ public ConfigurationManager(
         storageProvider == null
             ? InMemoryStorageProvider.builder().maxQueueItems(maxQueueItems).build()
             : storageProvider;
-    this.configuration =
-        configuration == null ? Configuration.defaultConfiguration() : configuration;
     this.settingsManager =
         SettingsManager.builder()
             .settingsClient(

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

@@ -1,18 +1,18 @@
 package com.exceptionless.exceptionlessclient;
 
 import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
-import com.exceptionless.exceptionlessclient.models.Event;
-import com.exceptionless.exceptionlessclient.models.UserDescription;
 import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
 import com.exceptionless.exceptionlessclient.enums.EventType;
-import com.exceptionless.exceptionlessclient.settings.SettingsResponse;
-import com.exceptionless.exceptionlessclient.submission.SubmissionResponse;
+import com.exceptionless.exceptionlessclient.models.Event;
+import com.exceptionless.exceptionlessclient.models.UserDescription;
 import com.exceptionless.exceptionlessclient.queue.DefaultEventQueue;
 import com.exceptionless.exceptionlessclient.settings.DefaultSettingsClient;
 import com.exceptionless.exceptionlessclient.settings.ServerSettings;
+import com.exceptionless.exceptionlessclient.settings.SettingsResponse;
 import com.exceptionless.exceptionlessclient.storage.InMemoryStorage;
 import com.exceptionless.exceptionlessclient.storage.InMemoryStorageProvider;
 import com.exceptionless.exceptionlessclient.submission.DefaultSubmissionClient;
+import com.exceptionless.exceptionlessclient.submission.SubmissionResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -39,10 +39,8 @@ public void setup() {
     settingsStorage = InMemoryStorage.<ServerSettings>builder().build();
     configurationManager =
         TestFixtures.aDefaultConfigurationManager()
-            .configuration(
-                TestFixtures.aDefaultConfiguration()
-                    .updateSettingsWhenIdleInterval(3600L)
-                    .build()) // We don't want the timer to run by default
+            // We don't want the timer to run by default
+            .updateSettingsWhenIdleInterval(3600L)
             .settingsClient(settingsClient)
             .storageProvider(storageProvider)
             .submissionClient(submissionClient)

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

@@ -1,6 +1,5 @@
 package com.exceptionless.exceptionlessclient;
 
-import com.exceptionless.exceptionlessclient.configuration.Configuration;
 import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
 import com.exceptionless.exceptionlessclient.queue.DefaultEventQueue;
 import com.exceptionless.exceptionlessclient.storage.InMemoryStorageProvider;
@@ -9,14 +8,9 @@
 public final class TestFixtures {
   private TestFixtures() {}
 
-  public static Configuration.ConfigurationBuilder aDefaultConfiguration() {
-    return Configuration.builder().apiKey("12456790abcdef");
-  }
-
   public static ConfigurationManager.ConfigurationManagerBuilder aDefaultConfigurationManager() {
     return ConfigurationManager.builder()
         .apiKey("12456790abcdef")
-        .configuration(aDefaultConfiguration().build())
         .queue(Mockito.mock(DefaultEventQueue.class))
         .storageProvider(InMemoryStorageProvider.builder().build());
   }