Removed configuration from DefaultEventQueue

pc9795 · pc9795 · commit fd511be8dcc5 · 2021-06-03T17:14:01.000+01:00
diff --git a/src/main/java/com/exceptionless/exceptionlessclient/configuration/ConfigurationManager.java b/src/main/java/com/exceptionless/exceptionlessclient/configuration/ConfigurationManager.java
@@ -136,7 +136,7 @@ public ConfigurationManager(
     this.queue =
         queue == null
             ? DefaultEventQueue.builder()
-                .configuration(this.configuration)
+                .submissionBatchSize(this.submissionBatchSize)
                 .processingIntervalInSecs(processingIntervalInSecs)
                 .storageProvider(this.storageProvider)
                 .submissionClient(this.submissionClient)
diff --git a/src/main/java/com/exceptionless/exceptionlessclient/queue/DefaultEventQueue.java b/src/main/java/com/exceptionless/exceptionlessclient/queue/DefaultEventQueue.java
@@ -1,6 +1,6 @@
 package com.exceptionless.exceptionlessclient.queue;
 
-import com.exceptionless.exceptionlessclient.configuration.Configuration;
+import com.exceptionless.exceptionlessclient.configuration.ValueProvider;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.storage.StorageItem;
 import com.exceptionless.exceptionlessclient.storage.StorageProviderIF;
@@ -27,7 +27,7 @@ public class DefaultEventQueue implements EventQueueIF {
   private static final Integer DEFAULT_SUSPENSION_DURATION_IN_MINS = 5;
 
   private final StorageProviderIF storageProvider;
-  private final Configuration configuration;
+  private final ValueProvider<Integer> submissionBatchSize;
   private final SubmissionClientIF submissionClient;
   private LocalDateTime discardQueueItemsUntil;
   private LocalDateTime suspendProcessingUntil;
@@ -39,15 +39,15 @@ public class DefaultEventQueue implements EventQueueIF {
   @Builder
   public DefaultEventQueue(
       StorageProviderIF storageProvider,
-      Configuration configuration,
+      ValueProvider<Integer> submissionBatchSize,
       SubmissionClientIF submissionClient,
       Integer processingIntervalInSecs) {
     this.storageProvider = storageProvider;
-    this.configuration = configuration;
+    this.submissionBatchSize = submissionBatchSize;
     this.submissionClient = submissionClient;
     this.queueTimer = new Timer(QUEUE_TIMER_NAME);
     this.handlers = new ArrayList<>();
-    this.currentSubmissionBatchSize = configuration.getSubmissionBatchSize();
+    this.currentSubmissionBatchSize = submissionBatchSize.get();
     init(
         processingIntervalInSecs == null
             ? DEFAULT_PROCESSING_INTERVAL_IN_SECS
@@ -133,8 +133,7 @@ public void process() {
 
       List<Event> events =
           storedEvents.stream().map(StorageItem::getValue).collect(Collectors.toList());
-      log.info(
-          String.format("Sending %s events to %s", events.size(), configuration.getServerUrl()));
+      log.info(String.format("Sending %s events", events.size()));
       SubmissionResponse response = submissionClient.postEvents(events);
       if (response.hasException()) {
         log.error("Error submitting events from queue", response.getException());
@@ -216,7 +215,7 @@ private void processSubmissionResponse(
   }
 
   private void setBatchSizeToConfigured() {
-    currentSubmissionBatchSize = configuration.getSubmissionBatchSize();
+    currentSubmissionBatchSize = submissionBatchSize.get();
   }
 
   private void removeEvents(List<StorageItem<Event>> storedEvents) {
diff --git a/src/test/java/com/exceptionless/exceptionlessclient/queue/DefaultEventQueueTest.java b/src/test/java/com/exceptionless/exceptionlessclient/queue/DefaultEventQueueTest.java
@@ -1,7 +1,6 @@
 package com.exceptionless.exceptionlessclient.queue;
 
-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.storage.InMemoryStorage;
 import com.exceptionless.exceptionlessclient.storage.InMemoryStorageProvider;
@@ -33,9 +32,6 @@ public class DefaultEventQueueTest {
 
   @BeforeEach
   public void setup() {
-    Configuration configuration =
-        TestFixtures.aDefaultConfiguration().submissionBatchSize(1).build();
-
     storage = InMemoryStorage.<Event>builder().build();
     doReturn(storage).when(storageProvider).getQueue();
 
@@ -44,7 +40,7 @@ public void setup() {
         DefaultEventQueue.builder()
             .storageProvider(storageProvider)
             .submissionClient(submissionClient)
-            .configuration(configuration)
+            .submissionBatchSize(ValueProvider.of(1))
             .processingIntervalInSecs(
                 3600) // We don't want the automatic timer to run in between tests by default
             .build();
@@ -260,13 +256,11 @@ public void itShouldSuspendProcessingByDefault() {
 
   @Test
   public void itShouldReduceSubmissionBatchSizeIfRequestEntitiesAreTooLarge() {
-    Configuration configuration =
-        TestFixtures.aDefaultConfiguration().submissionBatchSize(3).build();
     queue =
         DefaultEventQueue.builder()
             .storageProvider(storageProvider)
             .submissionClient(submissionClient)
-            .configuration(configuration)
+            .submissionBatchSize(ValueProvider.of(3))
             .processingIntervalInSecs(
                 3600) // We don't want the automatic timer to run in between tests by default
             .build();
@@ -311,13 +305,11 @@ public void itShouldDiscardEventsIfItCantReduceSubmissionSizeAndRequestEntitiesA
 
   @Test
   public void itShouldResetSubmissionBatchSizeOnNextSuccessfulResponse() {
-    Configuration configuration =
-        TestFixtures.aDefaultConfiguration().submissionBatchSize(3).build();
     queue =
         DefaultEventQueue.builder()
             .storageProvider(storageProvider)
             .submissionClient(submissionClient)
-            .configuration(configuration)
+            .submissionBatchSize(ValueProvider.of(3))
             .processingIntervalInSecs(
                 3600) // We don't want the automatic timer to run in between tests by default
             .build();
@@ -350,13 +342,11 @@ public void itShouldProcessEventsUsingTimer() throws InterruptedException {
         SubmissionResponse.builder().body("test-message").code(200).build();
     doReturn(response).when(submissionClient).postEvents(List.of(event));
 
-    Configuration configuration =
-        TestFixtures.aDefaultConfiguration().submissionBatchSize(1).build();
     queue =
         DefaultEventQueue.builder()
             .storageProvider(storageProvider)
             .submissionClient(submissionClient)
-            .configuration(configuration)
+            .submissionBatchSize(ValueProvider.of(1))
             .processingIntervalInSecs(1)
             .build();
     queue.onEventsPosted(testHandler);
