EPMRPP-110768 || Adapt to the updated service-api

build.gradle

@@ -30,6 +30,7 @@ apply from: scriptsUrl + '/signing.gradle'
 repositories {
     mavenLocal()
     mavenCentral { url = "https://repo1.maven.org/maven2" }
+    maven { url = "https://build.shibboleth.net/nexus/content/repositories/releases/" }
     if (!releaseMode) {
         maven { url = 'https://jitpack.io' }
     }
@@ -43,8 +44,8 @@ dependencies {
         implementation 'com.epam.reportportal:service-api'
         annotationProcessor 'com.epam.reportportal:service-api'
     } else {
-        implementation 'com.github.reportportal:service-api:7044a29'
-        annotationProcessor 'com.github.reportportal:service-api:7044a29'
+        implementation 'com.github.reportportal:service-api:e81b4f6'
+        annotationProcessor 'com.github.reportportal:service-api:e81b4f6'
     }
 
     compileOnly "org.projectlombok:lombok:${lombokVersion}"

src/main/java/com/epam/reportportal/extension/slack/SlackPluginExtension.java

@@ -16,7 +16,7 @@
 
 package com.epam.reportportal.extension.slack;
 
-import com.epam.reportportal.core.events.domain.PluginUploadedEvent;
+import com.epam.reportportal.base.core.events.domain.PluginUploadedEvent;
 import com.epam.reportportal.extension.CommonPluginCommand;
 import com.epam.reportportal.extension.PluginCommand;
 import com.epam.reportportal.extension.ReportPortalExtensionPoint;
@@ -31,10 +31,10 @@
 import com.epam.reportportal.extension.slack.factory.PropertyCollectorFactory;
 import com.epam.reportportal.extension.slack.info.impl.PluginInfoProviderImpl;
 import com.epam.reportportal.extension.slack.utils.MemoizingSupplier;
-import com.epam.reportportal.infrastructure.persistence.dao.IntegrationTypeRepository;
-import com.epam.reportportal.infrastructure.persistence.dao.LaunchRepository;
-import com.epam.reportportal.infrastructure.persistence.dao.ProjectRepository;
-import com.epam.reportportal.infrastructure.persistence.dao.TestItemRepository;
+import com.epam.reportportal.base.infrastructure.persistence.dao.IntegrationTypeRepository;
+import com.epam.reportportal.base.infrastructure.persistence.dao.LaunchRepository;
+import com.epam.reportportal.base.infrastructure.persistence.dao.ProjectRepository;
+import com.epam.reportportal.base.infrastructure.persistence.dao.TestItemRepository;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;

src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/AttributesCollector.java

@@ -5,8 +5,8 @@
 
 import com.epam.reportportal.extension.slack.collector.PropertyCollector;
 import com.epam.reportportal.extension.slack.model.enums.template.DefaultTemplateProperty;
-import com.epam.reportportal.infrastructure.persistence.entity.ItemAttribute;
-import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch;
+import com.epam.reportportal.base.infrastructure.persistence.entity.ItemAttribute;
+import com.epam.reportportal.base.infrastructure.persistence.entity.launch.Launch;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;

src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/LaunchPropertiesCollector.java

@@ -12,7 +12,7 @@
 
 import com.epam.reportportal.extension.slack.collector.PropertyCollector;
 import com.epam.reportportal.extension.slack.model.enums.template.DefaultTemplateProperty;
-import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch;
+import com.epam.reportportal.base.infrastructure.persistence.entity.launch.Launch;
 import com.google.common.collect.ImmutableMap;
 import java.util.LinkedHashMap;
 import java.util.Map;

src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/ResultColorCollector.java

@@ -15,15 +15,15 @@
  */
 package com.epam.reportportal.extension.slack.collector.laucnh;
 
-import static com.epam.reportportal.infrastructure.persistence.entity.enums.StatusEnum.FAILED;
-import static com.epam.reportportal.infrastructure.persistence.entity.enums.StatusEnum.INTERRUPTED;
-import static com.epam.reportportal.infrastructure.persistence.entity.enums.StatusEnum.PASSED;
+import static com.epam.reportportal.base.infrastructure.persistence.entity.enums.StatusEnum.FAILED;
+import static com.epam.reportportal.base.infrastructure.persistence.entity.enums.StatusEnum.INTERRUPTED;
+import static com.epam.reportportal.base.infrastructure.persistence.entity.enums.StatusEnum.PASSED;
 
 import com.epam.reportportal.extension.slack.collector.PropertyCollector;
 import com.epam.reportportal.extension.slack.model.enums.template.Color;
 import com.epam.reportportal.extension.slack.model.template.TextProperty;
-import com.epam.reportportal.infrastructure.persistence.entity.enums.StatusEnum;
-import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch;
+import com.epam.reportportal.base.infrastructure.persistence.entity.enums.StatusEnum;
+import com.epam.reportportal.base.infrastructure.persistence.entity.launch.Launch;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;

src/main/java/com/epam/reportportal/extension/slack/collector/laucnh/StatisticsPropertiesCollector.java

@@ -4,7 +4,7 @@
 
 import com.epam.reportportal.extension.slack.collector.PropertyCollector;
 import com.epam.reportportal.extension.slack.model.enums.template.StatisticTemplateProperty;
-import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch;
+import com.epam.reportportal.base.infrastructure.persistence.entity.launch.Launch;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.function.Function;

src/main/java/com/epam/reportportal/extension/slack/event/launch/SlackLaunchFinishEventListener.java

@@ -18,15 +18,15 @@
 import com.epam.reportportal.extension.event.LaunchFinishedNotificationEvent;
 import com.epam.reportportal.extension.slack.event.launch.resolver.AttachmentResolver;
 import com.epam.reportportal.extension.slack.event.launch.resolver.SenderCaseMatcher;
-import com.epam.reportportal.infrastructure.persistence.dao.LaunchRepository;
-import com.epam.reportportal.infrastructure.persistence.dao.ProjectRepository;
-import com.epam.reportportal.infrastructure.persistence.entity.enums.ProjectAttributeEnum;
-import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch;
-import com.epam.reportportal.infrastructure.persistence.entity.project.Project;
-import com.epam.reportportal.infrastructure.persistence.entity.project.ProjectUtils;
-import com.epam.reportportal.infrastructure.persistence.entity.project.email.SenderCase;
-import com.epam.reportportal.infrastructure.rules.exception.ErrorType;
-import com.epam.reportportal.infrastructure.rules.exception.ReportPortalException;
+import com.epam.reportportal.base.infrastructure.persistence.dao.LaunchRepository;
+import com.epam.reportportal.base.infrastructure.persistence.dao.ProjectRepository;
+import com.epam.reportportal.base.infrastructure.persistence.entity.enums.ProjectAttributeEnum;
+import com.epam.reportportal.base.infrastructure.persistence.entity.launch.Launch;
+import com.epam.reportportal.base.infrastructure.persistence.entity.project.Project;
+import com.epam.reportportal.base.infrastructure.persistence.entity.project.ProjectUtils;
+import com.epam.reportportal.base.infrastructure.persistence.entity.project.email.SenderCase;
+import com.epam.reportportal.base.infrastructure.rules.exception.ErrorType;
+import com.epam.reportportal.base.infrastructure.rules.exception.ReportPortalException;
 import java.util.Map;
 import java.util.Optional;
 import org.apache.commons.lang3.BooleanUtils;

src/main/java/com/epam/reportportal/extension/slack/event/launch/resolver/AttachmentResolver.java

@@ -24,7 +24,7 @@
 import com.epam.reportportal.extension.slack.model.enums.SlackEventType;
 import com.epam.reportportal.extension.slack.model.template.TemplateProperty;
 import com.epam.reportportal.extension.slack.model.template.TextProperty;
-import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch;
+import com.epam.reportportal.base.infrastructure.persistence.entity.launch.Launch;
 import com.fasterxml.jackson.databind.JsonNode;
 import java.util.LinkedHashMap;
 import java.util.List;

src/main/java/com/epam/reportportal/extension/slack/event/launch/resolver/SenderCaseMatcher.java

@@ -21,14 +21,14 @@
 import static com.epam.reportportal.extension.slack.model.enums.template.StatisticTemplateProperty.STATISTIC_EXECUTION_TOTAL;
 
 import com.epam.reportportal.extension.slack.utils.NotificationConfigConverter;
-import com.epam.reportportal.infrastructure.persistence.dao.TestItemRepository;
-import com.epam.reportportal.infrastructure.persistence.entity.enums.LogicalOperator;
-import com.epam.reportportal.infrastructure.persistence.entity.enums.SendCase;
-import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch;
-import com.epam.reportportal.infrastructure.persistence.entity.project.email.LaunchAttributeRule;
-import com.epam.reportportal.infrastructure.persistence.entity.project.email.SenderCase;
-import com.epam.reportportal.infrastructure.persistence.entity.statistics.Statistics;
-import com.epam.reportportal.reporting.ItemAttributeResource;
+import com.epam.reportportal.base.infrastructure.persistence.dao.TestItemRepository;
+import com.epam.reportportal.base.infrastructure.persistence.entity.enums.LogicalOperator;
+import com.epam.reportportal.base.infrastructure.persistence.entity.enums.SendCase;
+import com.epam.reportportal.base.infrastructure.persistence.entity.launch.Launch;
+import com.epam.reportportal.base.infrastructure.persistence.entity.project.email.LaunchAttributeRule;
+import com.epam.reportportal.base.infrastructure.persistence.entity.project.email.SenderCase;
+import com.epam.reportportal.base.infrastructure.persistence.entity.statistics.Statistics;
+import com.epam.reportportal.base.reporting.ItemAttributeResource;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;

src/main/java/com/epam/reportportal/extension/slack/event/plugin/PluginLoadedEventHandler.java

@@ -1,8 +1,8 @@
 package com.epam.reportportal.extension.slack.event.plugin;
 
-import com.epam.reportportal.core.events.domain.PluginUploadedEvent;
+import com.epam.reportportal.base.core.events.domain.PluginUploadedEvent;
 import com.epam.reportportal.extension.slack.info.PluginInfoProvider;
-import com.epam.reportportal.infrastructure.persistence.dao.IntegrationTypeRepository;
+import com.epam.reportportal.base.infrastructure.persistence.dao.IntegrationTypeRepository;
 import org.springframework.context.ApplicationListener;
 
 /**

src/main/java/com/epam/reportportal/extension/slack/factory/PropertyCollectorFactory.java

@@ -6,7 +6,7 @@
 import com.epam.reportportal.extension.slack.collector.laucnh.ResultColorCollector;
 import com.epam.reportportal.extension.slack.collector.laucnh.StatisticsPropertiesCollector;
 import com.epam.reportportal.extension.slack.model.template.TemplateProperty;
-import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch;
+import com.epam.reportportal.base.infrastructure.persistence.entity.launch.Launch;
 import java.util.List;
 
 public class PropertyCollectorFactory {

src/main/java/com/epam/reportportal/extension/slack/info/PluginInfoProvider.java

@@ -1,6 +1,6 @@
 package com.epam.reportportal.extension.slack.info;
 
-import com.epam.reportportal.infrastructure.persistence.entity.integration.IntegrationType;
+import com.epam.reportportal.base.infrastructure.persistence.entity.integration.IntegrationType;
 
 /**
  * @author <a href="mailto:[email protected]">Ivan Budayeu</a>

src/main/java/com/epam/reportportal/extension/slack/info/impl/PluginInfoProviderImpl.java

@@ -3,10 +3,10 @@
 import static java.util.Optional.ofNullable;
 
 import com.epam.reportportal.extension.slack.info.PluginInfoProvider;
-import com.epam.reportportal.infrastructure.persistence.entity.enums.IntegrationGroupEnum;
-import com.epam.reportportal.infrastructure.persistence.entity.integration.IntegrationType;
-import com.epam.reportportal.infrastructure.rules.exception.ErrorType;
-import com.epam.reportportal.infrastructure.rules.exception.ReportPortalException;
+import com.epam.reportportal.base.infrastructure.persistence.entity.enums.IntegrationGroupEnum;
+import com.epam.reportportal.base.infrastructure.persistence.entity.integration.IntegrationType;
+import com.epam.reportportal.base.infrastructure.rules.exception.ErrorType;
+import com.epam.reportportal.base.infrastructure.rules.exception.ReportPortalException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;

src/main/java/com/epam/reportportal/extension/slack/model/enums/SlackEventType.java

@@ -2,7 +2,7 @@
 
 import static java.util.Optional.ofNullable;
 
-import com.epam.reportportal.infrastructure.persistence.entity.integration.Integration;
+import com.epam.reportportal.base.infrastructure.persistence.entity.integration.Integration;
 import java.util.Optional;
 
 public enum SlackEventType {

src/main/java/com/epam/reportportal/extension/slack/model/enums/SlackIntegrationProperties.java

@@ -2,7 +2,7 @@
 
 import static java.util.Optional.ofNullable;
 
-import com.epam.reportportal.infrastructure.persistence.entity.integration.Integration;
+import com.epam.reportportal.base.infrastructure.persistence.entity.integration.Integration;
 import java.util.Optional;
 
 public enum SlackIntegrationProperties {

src/main/java/com/epam/reportportal/extension/slack/utils/NotificationConfigConverter.java

@@ -16,8 +16,8 @@
 
 package com.epam.reportportal.extension.slack.utils;
 
-import com.epam.reportportal.infrastructure.persistence.entity.project.email.LaunchAttributeRule;
-import com.epam.reportportal.reporting.ItemAttributeResource;
+import com.epam.reportportal.base.infrastructure.persistence.entity.project.email.LaunchAttributeRule;
+import com.epam.reportportal.base.reporting.ItemAttributeResource;
 import java.util.function.Function;
 
 /**

src/test/java/com/epam/reportportal/extension/slack/event/launch/SlackLaunchFinishEventListenerTest.java

@@ -28,9 +28,9 @@
 import com.epam.reportportal.extension.slack.event.launch.resolver.AttachmentResolver;
 import com.epam.reportportal.extension.slack.event.launch.resolver.SenderCaseMatcher;
 import com.epam.reportportal.extension.slack.utils.MockData;
-import com.epam.reportportal.infrastructure.persistence.dao.LaunchRepository;
-import com.epam.reportportal.infrastructure.persistence.dao.ProjectRepository;
-import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch;
+import com.epam.reportportal.base.infrastructure.persistence.dao.LaunchRepository;
+import com.epam.reportportal.base.infrastructure.persistence.dao.ProjectRepository;
+import com.epam.reportportal.base.infrastructure.persistence.entity.launch.Launch;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Optional;

src/test/java/com/epam/reportportal/extension/slack/utils/MockData.java

@@ -19,15 +19,15 @@
 import static com.epam.reportportal.extension.slack.event.launch.SlackLaunchFinishEventListener.PLUGIN_NOTIFICATION_TYPE;
 import static com.epam.reportportal.extension.slack.event.launch.SlackLaunchFinishEventListener.SLACK_NOTIFICATION_ATTRIBUTE;
 import static com.epam.reportportal.extension.slack.event.launch.SlackLaunchFinishEventListener.WEBHOOK_DETAILS;
-import static com.epam.reportportal.infrastructure.persistence.entity.enums.ProjectAttributeEnum.NOTIFICATIONS_ENABLED;
-
-import com.epam.reportportal.infrastructure.persistence.entity.attribute.Attribute;
-import com.epam.reportportal.infrastructure.persistence.entity.enums.SendCase;
-import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch;
-import com.epam.reportportal.infrastructure.persistence.entity.project.Project;
-import com.epam.reportportal.infrastructure.persistence.entity.project.ProjectAttribute;
-import com.epam.reportportal.infrastructure.persistence.entity.project.email.SenderCase;
-import com.epam.reportportal.infrastructure.persistence.entity.project.email.SenderCaseOptions;
+import static com.epam.reportportal.base.infrastructure.persistence.entity.enums.ProjectAttributeEnum.NOTIFICATIONS_ENABLED;
+
+import com.epam.reportportal.base.infrastructure.persistence.entity.attribute.Attribute;
+import com.epam.reportportal.base.infrastructure.persistence.entity.enums.SendCase;
+import com.epam.reportportal.base.infrastructure.persistence.entity.launch.Launch;
+import com.epam.reportportal.base.infrastructure.persistence.entity.project.Project;
+import com.epam.reportportal.base.infrastructure.persistence.entity.project.ProjectAttribute;
+import com.epam.reportportal.base.infrastructure.persistence.entity.project.email.SenderCase;
+import com.epam.reportportal.base.infrastructure.persistence.entity.project.email.SenderCaseOptions;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;