Moved module collector logic to plugin

Author: pc9795

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

@@ -37,7 +37,6 @@ public class ConfigurationManager {
 
   @Getter private final ErrorParserIF errorParser;
   @Getter private final LastReferenceIdManagerIF lastReferenceIdManager;
-  @Getter private final ModuleCollectorIF moduleCollector;
   @Getter private final SubmissionClientIF submissionClient;
   @Getter private final EventQueueIF queue;
   @Getter private final Configuration configuration;
@@ -56,7 +55,6 @@ public ConfigurationManager(
       ErrorParserIF errorParser,
       LastReferenceIdManagerIF lastReferenceIdManager,
       LogCapturerIF logCatpurer,
-      ModuleCollectorIF moduleCollector,
       SubmissionClientIF submissionClient,
       SettingsClientIF settingsClient,
       StorageProviderIF storageProvider,
@@ -69,8 +67,6 @@ public ConfigurationManager(
         lastReferenceIdManager == null
             ? DefaultLastReferenceIdManager.builder().build()
             : lastReferenceIdManager;
-    this.moduleCollector =
-        moduleCollector == null ? DefaultModuleCollector.builder().build() : moduleCollector;
     this.storageProvider =
         storageProvider == null
             ? InMemoryStorageProvider.builder().maxQueueItems(maxQueueItems).build()

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

@@ -2,17 +2,27 @@
 
 import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
+import com.exceptionless.exceptionlessclient.models.services.Module;
 import com.exceptionless.exceptionlessclient.models.services.error.Error;
 import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
 import lombok.Builder;
 
+import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 public class ModuleInfoPlugin implements EventPluginIF {
   private static final Integer DEFAULT_PRIORITY = 50;
 
+  private final List<Module> modules;
+
   @Builder
-  public ModuleInfoPlugin() {}
+  public ModuleInfoPlugin() {
+    this.modules =
+        ModuleLayer.boot().modules().stream()
+            .map(module -> Module.builder().name(module.getName()).build())
+            .collect(Collectors.toList());
+  }
 
   @Override
   public int getPriority() {
@@ -32,6 +42,6 @@ public void run(
       return;
     }
 
-    error.setModules(configurationManager.getModuleCollector().getModules());
+    error.setModules(modules);
   }
 }

src/main/java/com/exceptionless/exceptionlessclient/services/DefaultModuleCollector.java

@@ -7,30 +7,24 @@
 import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
 import com.exceptionless.exceptionlessclient.models.services.Module;
 import com.exceptionless.exceptionlessclient.models.services.error.Error;
-import com.exceptionless.exceptionlessclient.plugins.preconfigured.ModuleInfoPlugin;
-import com.exceptionless.exceptionlessclient.services.DefaultModuleCollector;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.doReturn;
 
 @ExtendWith(MockitoExtension.class)
 public class ModuleInfoPluginTest {
-  @Mock private DefaultModuleCollector moduleCollector;
   private ConfigurationManager configurationManager;
   private ModuleInfoPlugin plugin;
   private EventPluginContext context;
 
   @BeforeEach
   public void setup() {
-    configurationManager =
-        TestFixtures.aDefaultConfigurationManager().moduleCollector(moduleCollector).build();
+    configurationManager = TestFixtures.aDefaultConfigurationManager().build();
     plugin = ModuleInfoPlugin.builder().build();
   }
 
@@ -58,9 +52,6 @@ public void itShouldNotAddModulesIfPresent() {
 
   @Test
   public void itShouldAddModulesIfAbsent() {
-    List<Module> modules = List.of(Module.builder().moduleId(123L).build());
-    doReturn(modules).when(moduleCollector).getModules();
-
     context =
         EventPluginContext.from(
             Event.builder()
@@ -69,6 +60,5 @@ public void itShouldAddModulesIfAbsent() {
     plugin.run(context, configurationManager);
 
     assertThat(context.getEvent().getError()).isPresent();
-    assertThat(context.getEvent().getError().get().getModules()).isEqualTo(modules);
   }
 }