EPMRPP-109656 || Events refactoring (#47)

Author: Evelina02

build.gradle

@@ -29,8 +29,8 @@ dependencies {
         implementation 'com.epam.reportportal:service-api'
         annotationProcessor 'com.epam.reportportal:service-api'
     } else {
-        implementation 'com.github.reportportal:service-api:3e34a90'
-        annotationProcessor 'com.github.reportportal:service-api:3e34a90'
+        implementation 'com.github.reportportal:service-api:4a137a7'
+        annotationProcessor 'com.github.reportportal:service-api:4a137a7'
     }
 
     // add lombok support

src/main/java/com/epam/reportportal/extension/gitlab/GitlabExtension.java

@@ -6,8 +6,7 @@
 import com.epam.reportportal.extension.PluginCommand;
 import com.epam.reportportal.extension.ReportPortalExtensionPoint;
 import com.epam.reportportal.extension.common.IntegrationTypeProperties;
-import com.epam.reportportal.extension.event.PluginEvent;
-import com.epam.reportportal.extension.event.StartLaunchEvent;
+import com.epam.reportportal.core.events.domain.PluginUploadedEvent;
 import com.epam.reportportal.extension.gitlab.client.GitlabClientProvider;
 import com.epam.reportportal.extension.gitlab.command.DescriptionBuilderService;
 import com.epam.reportportal.extension.gitlab.command.GetIssueCommand;
@@ -22,17 +21,14 @@
 import com.epam.reportportal.extension.gitlab.command.SearchMilestonesCommand;
 import com.epam.reportportal.extension.gitlab.command.SearchUsersCommand;
 import com.epam.reportportal.extension.gitlab.command.TestConnectionCommand;
-import com.epam.reportportal.extension.gitlab.event.launch.StartLaunchEventListener;
-import com.epam.reportportal.extension.gitlab.event.plugin.PluginEventHandlerFactory;
-import com.epam.reportportal.extension.gitlab.event.plugin.PluginEventListener;
+import com.epam.reportportal.extension.gitlab.event.plugin.PluginLoadedEventListener;
 import com.epam.reportportal.extension.gitlab.info.impl.PluginInfoProviderImpl;
 import com.epam.reportportal.extension.gitlab.utils.GitlabObjectMapperProvider;
 import com.epam.reportportal.extension.gitlab.utils.MemoizingSupplier;
 import com.epam.reportportal.extension.util.RequestEntityConverter;
 import com.epam.reportportal.infrastructure.persistence.binary.DataStoreService;
 import com.epam.reportportal.infrastructure.persistence.dao.IntegrationRepository;
 import com.epam.reportportal.infrastructure.persistence.dao.IntegrationTypeRepository;
-import com.epam.reportportal.infrastructure.persistence.dao.LaunchRepository;
 import com.epam.reportportal.infrastructure.persistence.dao.LogRepository;
 import com.epam.reportportal.infrastructure.persistence.dao.ProjectRepository;
 import com.epam.reportportal.infrastructure.persistence.dao.TestItemRepository;
@@ -66,8 +62,7 @@ public class GitlabExtension implements ReportPortalExtensionPoint, DisposableBe
   private static final String DOCUMENTATION_LINK = "https://reportportal.io/docs/plugins/GitLab/";
   private final String resourcesDir;
   private final RequestEntityConverter requestEntityConverter;
-  private final Supplier<ApplicationListener<PluginEvent>> pluginLoadedListenerSupplier;
-  private final Supplier<ApplicationListener<StartLaunchEvent>> startLaunchEventListenerSupplier;
+  private final Supplier<ApplicationListener<PluginUploadedEvent>> pluginLoadedListenerSupplier;
   private final Supplier<GitlabClientProvider> gitlabClientProviderSupplier;
   private final Supplier<DescriptionBuilderService> descriptionBuilderServiceSupplier;
   @Autowired
@@ -85,8 +80,6 @@ public class GitlabExtension implements ReportPortalExtensionPoint, DisposableBe
   private final Supplier<Map<String, PluginCommand<?>>> pluginCommandMapping = new MemoizingSupplier<>(
       this::getCommands);
   @Autowired
-  private LaunchRepository launchRepository;
-  @Autowired
   private LogRepository logRepository;
   @Autowired
   private TestItemRepository testItemRepository;
@@ -103,13 +96,9 @@ public GitlabExtension(Map<String, Object> initParams) {
         .map(String::valueOf).orElse("");
 
     pluginLoadedListenerSupplier = new MemoizingSupplier<>(
-        () -> new PluginEventListener(PLUGIN_ID, new PluginEventHandlerFactory(
-            integrationTypeRepository,
-            integrationRepository,
+        () -> new PluginLoadedEventListener(PLUGIN_ID, integrationTypeRepository, integrationRepository,
             new PluginInfoProviderImpl(resourcesDir, BINARY_DATA_PROPERTIES_FILE_ID)
-        )));
-    startLaunchEventListenerSupplier = new MemoizingSupplier<>(
-        () -> new StartLaunchEventListener(launchRepository));
+        ));
 
     gitlabClientProviderSupplier = new MemoizingSupplier<>(
         () -> new GitlabClientProvider(textEncryptor));
@@ -154,7 +143,6 @@ private void initListeners() {
         ApplicationEventMulticaster.class
     );
     applicationEventMulticaster.addApplicationListener(pluginLoadedListenerSupplier.get());
-    applicationEventMulticaster.addApplicationListener(startLaunchEventListenerSupplier.get());
   }
 
   @Override
@@ -168,7 +156,6 @@ private void removeListeners() {
         ApplicationEventMulticaster.class
     );
     applicationEventMulticaster.removeApplicationListener(pluginLoadedListenerSupplier.get());
-    applicationEventMulticaster.removeApplicationListener(startLaunchEventListenerSupplier.get());
   }
 
   private Map<String, CommonPluginCommand<?>> getCommonCommands() {

src/main/java/com/epam/reportportal/extension/gitlab/event/EventHandlerFactory.java

@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.epam.reportportal.extension.gitlab.event.handler.plugin;
+package com.epam.reportportal.extension.gitlab.event.plugin;
 
-import com.epam.reportportal.extension.event.PluginEvent;
-import com.epam.reportportal.extension.gitlab.event.handler.EventHandler;
+import com.epam.reportportal.core.events.domain.PluginUploadedEvent;
 import com.epam.reportportal.extension.gitlab.info.PluginInfoProvider;
 import com.epam.reportportal.infrastructure.persistence.dao.IntegrationRepository;
 import com.epam.reportportal.infrastructure.persistence.dao.IntegrationTypeRepository;
@@ -26,32 +25,45 @@
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
+import org.springframework.context.ApplicationListener;
 
 /**
  * @author <a href="mailto:ivan_budayeu@epam.com">Ivan Budayeu</a>
  */
-public class PluginLoadedEventHandler implements EventHandler<PluginEvent> {
+public class PluginLoadedEventListener implements ApplicationListener<PluginUploadedEvent> {
 
+  private final String pluginId;
   private final IntegrationTypeRepository integrationTypeRepository;
   private final IntegrationRepository integrationRepository;
   private final PluginInfoProvider pluginInfoProvider;
 
-  public PluginLoadedEventHandler(IntegrationTypeRepository integrationTypeRepository,
-      IntegrationRepository integrationRepository,
-      PluginInfoProvider pluginInfoProvider) {
+  public PluginLoadedEventListener(String pluginId, IntegrationTypeRepository integrationTypeRepository,
+      IntegrationRepository integrationRepository, PluginInfoProvider pluginInfoProvider) {
+    this.pluginId = pluginId;
     this.integrationTypeRepository = integrationTypeRepository;
     this.integrationRepository = integrationRepository;
     this.pluginInfoProvider = pluginInfoProvider;
   }
 
   @Override
-  public void handle(PluginEvent event) {
-    integrationTypeRepository.findByName(event.getPluginId()).ifPresent(integrationType -> {
-      createIntegration(event.getPluginId(), integrationType);
+  public void onApplicationEvent(PluginUploadedEvent event) {
+    if (!supports(event)) {
+      return;
+    }
+
+    String eventPluginId = event.getPluginActivityResource().getName();
+    integrationTypeRepository.findByName(eventPluginId).ifPresent(integrationType -> {
+      createIntegration(eventPluginId, integrationType);
       integrationTypeRepository.save(pluginInfoProvider.provide(integrationType));
     });
   }
 
+  private boolean supports(PluginUploadedEvent event) {
+    return Objects.nonNull(event.getPluginActivityResource())
+        && pluginId.equals(event.getPluginActivityResource().getName());
+  }
+
   private void createIntegration(String name, IntegrationType integrationType) {
     List<Integration> integrations = integrationRepository.findAllGlobalByType(integrationType);
     if (integrations.isEmpty()) {
@@ -65,5 +77,4 @@ private void createIntegration(String name, IntegrationType integrationType) {
       integrationRepository.save(integration);
     }
   }
-
 }