Merge pull request #60 from exceptionless/refactor-configuration-manager

Merged ConfigurationManager and Configuration into one class

Author: pc9795

README.md

@@ -1,6 +1,8 @@
 # Exceptionless.Java
 
-The definition of the word exceptionless is: to be without exception. [Exceptionless](https://exceptionless.io) provides real-time error reporting for your Java apps. It organizes the gathered information into simple actionable data that will help your app become exceptionless!
+The definition of the word exceptionless is: to be without exception. [Exceptionless](https://exceptionless.io) provides
+real-time error reporting for your Java apps. It organizes the gathered information into simple actionable data that
+will help your app become exceptionless!
 
 ## Using Exceptionless
 
@@ -11,7 +13,7 @@ Refer to the Exceptionless documentation here: [Exceptionless Docs](http://docs.
 ## Show me the code
 
 ```java
-class ExampleApp{
+class ExampleApp {
     public static void main(String[] args) {
         private static final ExceptionlessClient client =
                 ExceptionlessClient.from(
@@ -44,24 +46,26 @@ _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.builder().queue(queue).configuration(configuration).build();
-ExceptionlessClient client =
-    ExceptionlessClient.builder().configurationManager(configurationManager).build();
+Configuration configuration = Configuration.builder()
+        .serverUrl("http://your-server-url")
+        .apiKey("your-api-key")
+        .queue(queue)
+        .build();
+ExceptionlessClient client = 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
 don't feel the pressure to supply values for all the fields. **Note:** Whenever customizing the client
-using `ConfigurationManager` never forget to supply your `serverUrl` and `apiKey` using a `Configuration` object as
+using `Configuration` never forget to supply your `serverUrl` and `apiKey` using a `Configuration` object as
 shown above.
 
 ## Spring Boot Users
 
-You can observe `NoClassDefFoundError` in your Spring-boot apps because Spring-boot uses v3 of `OkHttpClient` while this client uses v4. In that case you have to explicitly declare v4 of the library in you `pom.xml/build.gradle`.
+You can observe `NoClassDefFoundError` in your Spring-boot apps because Spring-boot uses v3 of `OkHttpClient` while this
+client uses v4. In that case you have to explicitly declare v4 of the library in you `pom.xml/build.gradle`.
 
 ```xml
+
 <dependencies>
     <dependency>
         <groupId>com.exceptionless</groupId>
@@ -83,15 +87,18 @@ You can observe `NoClassDefFoundError` in your Spring-boot apps because Spring-b
 
 ## General Data Protection Regulation
 
-By default the Exceptionless Client will report all available metadata including potential PII data.
-You can fine tune the collection of information via Data Exclusions or turning off collection completely.
+By default the Exceptionless Client will report all available metadata including potential PII data. You can fine tune
+the collection of information via Data Exclusions or turning off collection completely.
 
-Please visit the [docs](https://exceptionless.com/docs/clients/javascript/client-configuration/#general-data-protection-regulation)
+Please visit
+the [docs](https://exceptionless.com/docs/clients/javascript/client-configuration/#general-data-protection-regulation)
 for detailed information on how to configure the client to meet your requirements.
 
 ## Support
 
-If you need help, please contact us via in-app support, [open an issue](https://github.com/exceptionless/Exceptionless.Java/issues/new) or [join our chat on Discord](https://discord.gg/6HxgFCx). We’re always here to help if you have any questions!
+If you need help, please contact us via in-app
+support, [open an issue](https://github.com/exceptionless/Exceptionless.Java/issues/new)
+or [join our chat on Discord](https://discord.gg/6HxgFCx). We’re always here to help if you have any questions!
 
 ## Thanks
 

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>

samples/example-app/src/main/java/com/exceptionless/example/app/ExampleApp.java

@@ -19,7 +19,7 @@ public static void sampleEventSubmissions() {
   }
 
   public static void sampleUseOfSessions() {
-    client.getConfigurationManager().useSessions();
+    client.getConfiguration().useSessions();
     client.submitEvent(client.createSessionStart().userIdentity("test-user").build());
     client.submitSessionEnd("test-user");
   }

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

@@ -1,7 +1,6 @@
 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;
 import com.exceptionless.exceptionlessclient.models.Event;
@@ -28,27 +27,24 @@ 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,
-      long updateSettingsTimerInitialDelay,
-      Integer nThreads) {
-    this.configurationManager = configurationManager;
-    this.eventPluginRunner =
-        EventPluginRunner.builder().configurationManager(this.configurationManager).build();
+      Configuration configuration, long updateSettingsTimerInitialDelay, Integer nThreads) {
+    this.configuration = configuration;
+    this.eventPluginRunner = EventPluginRunner.builder().configuration(this.configuration).build();
     this.updateSettingsTimer = new Timer(UPDATE_SETTINGS_TIMER_NAME);
     this.executorService = Executors.newFixedThreadPool(nThreads);
     init(updateSettingsTimerInitialDelay);
@@ -60,29 +56,25 @@ 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.getConfiguration().getUpdateSettingsWhenIdleInterval());
+        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()
-                .configuration(Configuration.builder().apiKey(apiKey).serverUrl(serverUrl).build())
-                .build())
+        .configuration(Configuration.builder().apiKey(apiKey).serverUrl(serverUrl).build())
         .build();
   }
 
@@ -223,9 +215,7 @@ public Event.EventBuilder createSessionStart() {
   }
 
   public Event.EventBuilder createEvent() {
-    return Event.builder()
-        .dataExclusions(configurationManager.getDataExclusions())
-        .date(LocalDate.now());
+    return Event.builder().dataExclusions(configuration.getDataExclusions()).date(LocalDate.now());
   }
 
   public CompletableFuture<Void> submitEventAsync(Event event) {
@@ -252,7 +242,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(
@@ -264,7 +254,7 @@ public CompletableFuture<SubmissionResponse> updateEmailAndDescriptionAsync(
   public SubmissionResponse updateEmailAndDescription(
       String referenceId, String email, String description) {
     SubmissionResponse response =
-        configurationManager
+        configuration
             .getSubmissionClient()
             .postUserDescription(
                 referenceId,
@@ -285,6 +275,6 @@ public SubmissionResponse updateEmailAndDescription(
   }
 
   public String getLastReferenceId() {
-    return configurationManager.getLastReferenceIdManager().getLast();
+    return configuration.getLastReferenceIdManager().getLast();
   }
 }