Renamed ConfigurationManager to Configuration

Author: pc9795

README.md

@@ -46,10 +46,10 @@ _Example: Customizing your Event Queue implementation_
 EventQueueIF queue = //get your implementation
 Configuration configuration =
     Configuration.builder().serverUrl("http://your-server-url").apiKey("your-api-key").build();
-ConfigurationManager configurationManager =
+ConfigurationManager configuration =
     ConfigurationManager.builder().queue(queue).configuration(configuration).build();
 ExceptionlessClient client =
-    ExceptionlessClient.builder().configurationManager(configurationManager).build();
+    ExceptionlessClient.builder().configuration(configuration).build();
 ```
 
 In this library we have made sure that all the values which are not set by builders fallback to reasonable defaults. So

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

@@ -1,6 +1,6 @@
 package com.exceptionless.exceptionlessclient;
 
-import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
+import com.exceptionless.exceptionlessclient.configuration.Configuration;
 import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
 import com.exceptionless.exceptionlessclient.enums.EventType;
 import com.exceptionless.exceptionlessclient.models.Event;
@@ -27,27 +27,27 @@ public class ExceptionlessClient {
   private static final int UPDATE_SETTINGS_TIMER_INITIAL_DELAY = 5000;
   private static final Integer DEFAULT_NTHREADS = 10;
 
-  @Getter private final ConfigurationManager configurationManager;
+  @Getter private final Configuration configuration;
   private final EventPluginRunner eventPluginRunner;
   private final Timer updateSettingsTimer;
   private final ExecutorService executorService;
 
   @Builder
-  public ExceptionlessClient(ConfigurationManager configurationManager, Integer nThreads) {
+  public ExceptionlessClient(Configuration configuration, Integer nThreads) {
     this(
-        configurationManager,
+            configuration,
         UPDATE_SETTINGS_TIMER_INITIAL_DELAY,
         nThreads == null ? DEFAULT_NTHREADS : nThreads);
   }
 
   @VisibleForTesting
   ExceptionlessClient(
-      ConfigurationManager configurationManager,
+      Configuration configuration,
       long updateSettingsTimerInitialDelay,
       Integer nThreads) {
-    this.configurationManager = configurationManager;
+    this.configuration = configuration;
     this.eventPluginRunner =
-        EventPluginRunner.builder().configurationManager(this.configurationManager).build();
+        EventPluginRunner.builder().configuration(this.configuration).build();
     this.updateSettingsTimer = new Timer(UPDATE_SETTINGS_TIMER_NAME);
     this.executorService = Executors.newFixedThreadPool(nThreads);
     init(updateSettingsTimerInitialDelay);
@@ -59,27 +59,27 @@ private void init(long delay) {
           @Override
           public void run() {
             try {
-              configurationManager.getSettingsManager().updateSettings();
+              configuration.getSettingsManager().updateSettings();
             } catch (Exception e) {
               log.error("Error in updating settings", e);
             }
           }
         },
         delay,
-        configurationManager.getUpdateSettingsWhenIdleInterval().get());
+        configuration.getUpdateSettingsWhenIdleInterval().get());
 
-    configurationManager.onChanged(
-        ignored -> configurationManager.getSettingsManager().updateSettings());
-    configurationManager
+    configuration.onChanged(
+        ignored -> configuration.getSettingsManager().updateSettings());
+    configuration
         .getQueue()
         .onEventsPosted(
-            (ignored1, ignored2) -> configurationManager.getSettingsManager().updateSettings());
+            (ignored1, ignored2) -> configuration.getSettingsManager().updateSettings());
   }
 
   public static ExceptionlessClient from(String apiKey, String serverUrl) {
     return ExceptionlessClient.builder()
-        .configurationManager(
-            ConfigurationManager.builder().apiKey(apiKey).serverUrl(serverUrl).build())
+        .configuration(
+            Configuration.builder().apiKey(apiKey).serverUrl(serverUrl).build())
         .build();
   }
 
@@ -221,7 +221,7 @@ public Event.EventBuilder createSessionStart() {
 
   public Event.EventBuilder createEvent() {
     return Event.builder()
-        .dataExclusions(configurationManager.getDataExclusions())
+        .dataExclusions(configuration.getDataExclusions())
         .date(LocalDate.now());
   }
 
@@ -249,7 +249,7 @@ public CompletableFuture<Void> submitSessionEndAsync(String sessionOrUserId) {
 
   public void submitSessionEnd(String sessionOrUserId) {
     log.info(String.format("Submitting session end: %s", sessionOrUserId));
-    configurationManager.getSubmissionClient().sendHeartBeat(sessionOrUserId, true);
+    configuration.getSubmissionClient().sendHeartBeat(sessionOrUserId, true);
   }
 
   public CompletableFuture<SubmissionResponse> updateEmailAndDescriptionAsync(
@@ -261,7 +261,7 @@ public CompletableFuture<SubmissionResponse> updateEmailAndDescriptionAsync(
   public SubmissionResponse updateEmailAndDescription(
       String referenceId, String email, String description) {
     SubmissionResponse response =
-        configurationManager
+        configuration
             .getSubmissionClient()
             .postUserDescription(
                 referenceId,
@@ -282,6 +282,6 @@ public SubmissionResponse updateEmailAndDescription(
   }
 
   public String getLastReferenceId() {
-    return configurationManager.getLastReferenceIdManager().getLast();
+    return configuration.getLastReferenceIdManager().getLast();
   }
 }

src/main/java/com/exceptionless/exceptionlessclient/configuration/ConfigurationManager.java renamed to src/main/java/com/exceptionless/exceptionlessclient/configuration/Configuration.java

@@ -34,7 +34,7 @@
 import java.util.function.Consumer;
 
 @Slf4j
-public class ConfigurationManager {
+public class Configuration {
   private static final Integer API_KEY_MIN_LENGTH = 11;
   private static final Integer DEFAULT_HEART_BEAT_INTERVAL_IN_SECS = 30;
   private static final String DEFAULT_SERVER_URL = "https://collector.exceptionless.io";
@@ -63,7 +63,7 @@ public static class Property {
   @Getter private final EventQueueIF queue;
   @Getter private final Set<String> defaultTags;
   @Getter private final Map<String, Object> defaultData;
-  private final List<Consumer<ConfigurationManager>> onChangedHandlers;
+  private final List<Consumer<Configuration>> onChangedHandlers;
   @Getter private final SettingsManager settingsManager;
   private final Set<String> userAgentBotPatterns;
   @Getter private final PrivateInformationInclusions privateInformationInclusions;
@@ -81,7 +81,7 @@ public static class Property {
   private final PropertyChangeSupport propertyChangeSupport;
 
   @Builder
-  public ConfigurationManager(
+  public Configuration(
       LastReferenceIdManagerIF lastReferenceIdManager,
       LogCapturerIF logCatpurer,
       SubmissionClientIF submissionClient,
@@ -301,14 +301,14 @@ public void addPlugin(EventPluginIF eventPlugin) {
     pluginManager.addPlugin(eventPlugin);
   }
 
-  public void addPlugin(BiConsumer<EventPluginContext, ConfigurationManager> pluginAction) {
+  public void addPlugin(BiConsumer<EventPluginContext, Configuration> pluginAction) {
     pluginManager.addPlugin(pluginAction);
   }
 
   public void addPlugin(
       String name,
       int priority,
-      BiConsumer<EventPluginContext, ConfigurationManager> pluginAction) {
+      BiConsumer<EventPluginContext, Configuration> pluginAction) {
     pluginManager.addPlugin(name, priority, pluginAction);
   }
 
@@ -344,12 +344,12 @@ public void useSessions(int heartbeatIntervalInSecs) {
     addPlugin(HeartbeatPlugin.builder().heartbeatIntervalInSecs(heartbeatIntervalInSecs).build());
   }
 
-  public void onChanged(Consumer<ConfigurationManager> onChangedHandler) {
+  public void onChanged(Consumer<Configuration> onChangedHandler) {
     onChangedHandlers.add(onChangedHandler);
   }
 
   private void changed() {
-    for (Consumer<ConfigurationManager> onChangedHandler : onChangedHandlers) {
+    for (Consumer<Configuration> onChangedHandler : onChangedHandlers) {
       try {
         onChangedHandler.accept(this);
       } catch (Exception e) {

src/main/java/com/exceptionless/exceptionlessclient/plugins/EventPluginIF.java

@@ -1,6 +1,6 @@
 package com.exceptionless.exceptionlessclient.plugins;
 
-import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
+import com.exceptionless.exceptionlessclient.configuration.Configuration;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
 
 public interface EventPluginIF {
@@ -10,5 +10,5 @@ default String getName() {
     return getClass().getName();
   }
 
-  void run(EventPluginContext eventPluginContext, ConfigurationManager configurationManager);
+  void run(EventPluginContext eventPluginContext, Configuration configuration);
 }

src/main/java/com/exceptionless/exceptionlessclient/plugins/EventPluginRunner.java

@@ -1,21 +1,21 @@
 package com.exceptionless.exceptionlessclient.plugins;
 
-import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
+import com.exceptionless.exceptionlessclient.configuration.Configuration;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
 import lombok.Builder;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class EventPluginRunner {
-  private final ConfigurationManager configurationManager;
+  private final Configuration configuration;
 
   @Builder
-  public EventPluginRunner(ConfigurationManager configurationManager) {
-    this.configurationManager = configurationManager;
+  public EventPluginRunner(Configuration configuration) {
+    this.configuration = configuration;
   }
 
   public void run(EventPluginContext eventPluginContext) {
-    configurationManager
+    configuration
         .getPlugins()
         .forEach(
             plugin -> {
@@ -24,7 +24,7 @@ public void run(EventPluginContext eventPluginContext) {
               }
 
               try {
-                plugin.run(eventPluginContext, configurationManager);
+                plugin.run(eventPluginContext, configuration);
 
               } catch (Exception e) {
                     log.error(
@@ -44,8 +44,8 @@ public void run(EventPluginContext eventPluginContext) {
       return;
     }
 
-    configurationManager.getQueue().enqueue(eventPluginContext.getEvent());
-    configurationManager
+    configuration.getQueue().enqueue(eventPluginContext.getEvent());
+    configuration
         .getLastReferenceIdManager()
         .setLast(eventPluginContext.getEvent().getReferenceId());
   }

src/main/java/com/exceptionless/exceptionlessclient/plugins/PluginManager.java

@@ -1,6 +1,6 @@
 package com.exceptionless.exceptionlessclient.plugins;
 
-import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
+import com.exceptionless.exceptionlessclient.configuration.Configuration;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
 import com.exceptionless.exceptionlessclient.plugins.preconfigured.*;
 import lombok.Builder;
@@ -53,14 +53,14 @@ private void sortPlugins() {
     plugins.sort((o1, o2) -> o2.getPriority() - o1.getPriority());
   }
 
-  public void addPlugin(BiConsumer<EventPluginContext, ConfigurationManager> pluginAction) {
+  public void addPlugin(BiConsumer<EventPluginContext, Configuration> pluginAction) {
     addPlugin(UUID.randomUUID().toString(), DEFAULT_PLUGIN_PRIORITY, pluginAction);
   }
 
   public void addPlugin(
       String name,
       int priority,
-      BiConsumer<EventPluginContext, ConfigurationManager> pluginAction) {
+      BiConsumer<EventPluginContext, Configuration> pluginAction) {
     addPlugin(
         new EventPluginIF() {
           @Override
@@ -75,8 +75,8 @@ public String getName() {
 
           @Override
           public void run(
-              EventPluginContext eventPluginContext, ConfigurationManager configurationManager) {
-            pluginAction.accept(eventPluginContext, configurationManager);
+              EventPluginContext eventPluginContext, Configuration configuration) {
+            pluginAction.accept(eventPluginContext, configuration);
           }
         });
   }

src/main/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/ConfigurationDefaultsPlugin.java

@@ -1,6 +1,6 @@
 package com.exceptionless.exceptionlessclient.plugins.preconfigured;
 
-import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
+import com.exceptionless.exceptionlessclient.configuration.Configuration;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
 import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
@@ -19,12 +19,12 @@ public int getPriority() {
 
   @Override
   public void run(
-      EventPluginContext eventPluginContext, ConfigurationManager configurationManager) {
+      EventPluginContext eventPluginContext, Configuration configuration) {
     Event event = eventPluginContext.getEvent();
-    for (String tag : configurationManager.getDefaultTags()) {
+    for (String tag : configuration.getDefaultTags()) {
       event.addTags(tag);
     }
 
-    event.addData(configurationManager.getDefaultData(), configurationManager.getDataExclusions());
+    event.addData(configuration.getDefaultData(), configuration.getDataExclusions());
   }
 }

src/main/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/DuplicateCheckerPlugin.java

@@ -1,6 +1,6 @@
 package com.exceptionless.exceptionlessclient.plugins.preconfigured;
 
-import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
+import com.exceptionless.exceptionlessclient.configuration.Configuration;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
 import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
@@ -65,7 +65,7 @@ public int getPriority() {
 
   @Override
   public void run(
-      EventPluginContext eventPluginContext, ConfigurationManager configurationManager) {
+      EventPluginContext eventPluginContext, Configuration configuration) {
     Event event = eventPluginContext.getEvent();
     long hash = getHash(event);
     Optional<MergedEvent> maybeMergedEvent =
@@ -92,7 +92,7 @@ public void run(
       mergedEvents.add(
           MergedEvent.builder()
               .event(event)
-              .eventQueue(configurationManager.getQueue())
+              .eventQueue(configuration.getQueue())
               .hash(hash)
               .build());
       eventPluginContext.getContext().setEventCancelled(true);

src/main/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/EnvironmentInfoPlugin.java

@@ -1,6 +1,6 @@
 package com.exceptionless.exceptionlessclient.plugins.preconfigured;
 
-import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
+import com.exceptionless.exceptionlessclient.configuration.Configuration;
 import com.exceptionless.exceptionlessclient.enums.EnvironmentInfoPropertyKey;
 import com.exceptionless.exceptionlessclient.models.EnvironmentInfo;
 import com.exceptionless.exceptionlessclient.models.Event;
@@ -53,16 +53,16 @@ public int getPriority() {
 
   @Override
   public void run(
-      EventPluginContext eventPluginContext, ConfigurationManager configurationManager) {
+      EventPluginContext eventPluginContext, Configuration configuration) {
     Event event = eventPluginContext.getEvent();
     if (event.getEnvironmentInfo().isEmpty()) {
       event.addEnvironmentInfo(
           getEnvironmentInfo(
               EnvironmentInfoGetArgs.builder()
                   .includeIpAddress(
-                      configurationManager.getPrivateInformationInclusions().getIpAddress())
+                      configuration.getPrivateInformationInclusions().getIpAddress())
                   .includeMachineName(
-                      configurationManager.getPrivateInformationInclusions().getMachineName())
+                      configuration.getPrivateInformationInclusions().getMachineName())
                   .build()));
     }
   }

src/main/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/ErrorPlugin.java

@@ -1,6 +1,6 @@
 package com.exceptionless.exceptionlessclient.plugins.preconfigured;
 
-import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
+import com.exceptionless.exceptionlessclient.configuration.Configuration;
 import com.exceptionless.exceptionlessclient.enums.EventPropertyKey;
 import com.exceptionless.exceptionlessclient.enums.EventType;
 import com.exceptionless.exceptionlessclient.models.Event;
@@ -26,7 +26,7 @@ public int getPriority() {
 
   @Override
   public void run(
-      EventPluginContext eventPluginContext, ConfigurationManager configurationManager) {
+      EventPluginContext eventPluginContext, Configuration configuration) {
     Exception exception = eventPluginContext.getContext().getException();
     if (exception == null) {
       return;
@@ -40,7 +40,7 @@ public void run(
 
     event.addError(parse(exception));
 
-    Set<String> dataExclusions = new HashSet<>(configurationManager.getDataExclusions());
+    Set<String> dataExclusions = new HashSet<>(configuration.getDataExclusions());
     event.addData(Map.of(EventPropertyKey.EXTRA.value(), exception), dataExclusions);
   }