diff --git a/build.gradle b/build.gradle index ddc02c6..1c8b64f 100644 --- a/build.gradle +++ b/build.gradle @@ -32,23 +32,15 @@ repositories { } } -dependencyManagement { - imports { - mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.13.2') - } -} - ext['spring-boot.version'] = "${springBootVersion}" dependencies { if (releaseMode) { - implementation 'com.epam.reportportal:commons-dao' - implementation 'com.epam.reportportal:plugin-api' - annotationProcessor 'com.epam.reportportal:plugin-api' + implementation 'com.epam.reportportal:service-api' + annotationProcessor 'com.epam.reportportal:service-api' } else { - implementation 'com.github.reportportal:commons-dao:196d4ac' - implementation 'com.github.reportportal:plugin-api:9bd040f' - annotationProcessor 'com.github.reportportal:plugin-api:9bd040f' + implementation 'com.github.reportportal:service-api:3e34a90' + annotationProcessor 'com.github.reportportal:service-api:3e34a90' } compileOnly "org.projectlombok:lombok:${lombokVersion}" diff --git a/gradle.properties b/gradle.properties index 097c0b3..ce0c52d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ version=1.1.0 description=EPAM Report Portal. Telegram plugin. pluginId=telegram -lombokVersion=1.18.36 -springBootVersion=3.4.2 +lombokVersion=1.18.42 +springBootVersion=3.4.11 diff --git a/src/main/java/com/epam/reportportal/extension/telegram/TelegramPlugin.java b/src/main/java/com/epam/reportportal/extension/telegram/TelegramPlugin.java index 5d4a75c..7155a1b 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/TelegramPlugin.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/TelegramPlugin.java @@ -7,14 +7,14 @@ * @author Andrei Piankouski */ public class TelegramPlugin extends Plugin { - /** - * Constructor to be used by plugin manager for plugin instantiation. - * Your plugins have to provide constructor with this exact signature to - * be successfully loaded by manager. - * - * @param wrapper - A wrapper over plugin instance. - */ - public TelegramPlugin(PluginWrapper wrapper) { - super(wrapper); - } + + /** + * Constructor to be used by plugin manager for plugin instantiation. Your plugins have to provide constructor with + * this exact signature to be successfully loaded by manager. + * + * @param wrapper - A wrapper over plugin instance. + */ + public TelegramPlugin(PluginWrapper wrapper) { + super(wrapper); + } } diff --git a/src/main/java/com/epam/reportportal/extension/telegram/TelegramPluginExtension.java b/src/main/java/com/epam/reportportal/extension/telegram/TelegramPluginExtension.java index d09f42f..7fb41c5 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/TelegramPluginExtension.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/TelegramPluginExtension.java @@ -31,17 +31,18 @@ import com.epam.reportportal.extension.telegram.factory.PropertyCollectorFactory; import com.epam.reportportal.extension.telegram.info.impl.PluginInfoProviderImpl; import com.epam.reportportal.extension.telegram.utils.MemoizingSupplier; -import com.epam.ta.reportportal.dao.IntegrationRepository; -import com.epam.ta.reportportal.dao.IntegrationTypeRepository; -import com.epam.ta.reportportal.dao.LaunchRepository; -import com.epam.ta.reportportal.dao.ProjectRepository; -import com.epam.ta.reportportal.dao.TestItemRepository; +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.ProjectRepository; +import com.epam.reportportal.infrastructure.persistence.dao.TestItemRepository; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import jakarta.annotation.PostConstruct; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -51,18 +52,15 @@ import java.util.Map; import java.util.function.Supplier; import java.util.stream.Stream; -import jakarta.annotation.PostConstruct; import javax.sql.DataSource; import org.pf4j.Extension; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ApplicationEventMulticaster; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.core.io.FileSystemResource; -import org.springframework.core.task.TaskExecutor; import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; import org.springframework.web.client.RestTemplate; diff --git a/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/AttributesCollector.java b/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/AttributesCollector.java index 34ba947..5754296 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/AttributesCollector.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/AttributesCollector.java @@ -5,12 +5,12 @@ import com.epam.reportportal.extension.telegram.collector.PropertyCollector; import com.epam.reportportal.extension.telegram.model.enums.template.DefaultTemplateProperty; -import com.epam.ta.reportportal.entity.ItemAttribute; -import com.epam.ta.reportportal.entity.launch.Launch; +import com.epam.reportportal.infrastructure.persistence.entity.ItemAttribute; +import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; public class AttributesCollector implements PropertyCollector { diff --git a/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/LaunchPropertiesCollector.java b/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/LaunchPropertiesCollector.java index 33e499a..c68e20c 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/LaunchPropertiesCollector.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/LaunchPropertiesCollector.java @@ -12,7 +12,7 @@ import com.epam.reportportal.extension.telegram.collector.PropertyCollector; import com.epam.reportportal.extension.telegram.model.enums.template.DefaultTemplateProperty; -import com.epam.ta.reportportal.entity.launch.Launch; +import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch; import com.google.common.collect.ImmutableMap; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/ResultColorCollector.java b/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/ResultColorCollector.java index 212ae9f..ad5569f 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/ResultColorCollector.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/ResultColorCollector.java @@ -15,15 +15,15 @@ */ package com.epam.reportportal.extension.telegram.collector.laucnh; -import static com.epam.ta.reportportal.entity.enums.StatusEnum.FAILED; -import static com.epam.ta.reportportal.entity.enums.StatusEnum.INTERRUPTED; -import static com.epam.ta.reportportal.entity.enums.StatusEnum.PASSED; +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 com.epam.reportportal.extension.telegram.collector.PropertyCollector; import com.epam.reportportal.extension.telegram.model.enums.template.Color; import com.epam.reportportal.extension.telegram.model.template.TextProperty; -import com.epam.ta.reportportal.entity.enums.StatusEnum; -import com.epam.ta.reportportal.entity.launch.Launch; +import com.epam.reportportal.infrastructure.persistence.entity.enums.StatusEnum; +import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/StatisticsPropertiesCollector.java b/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/StatisticsPropertiesCollector.java index aff6d2c..020d898 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/StatisticsPropertiesCollector.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/collector/laucnh/StatisticsPropertiesCollector.java @@ -4,12 +4,12 @@ import com.epam.reportportal.extension.telegram.collector.PropertyCollector; import com.epam.reportportal.extension.telegram.model.enums.template.StatisticTemplateProperty; -import com.epam.ta.reportportal.entity.launch.Launch; +import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch; import java.util.Arrays; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; public class StatisticsPropertiesCollector implements PropertyCollector { @@ -22,8 +22,10 @@ public Map collect(Launch launch) { ofNullable(launch.getStatistics()).filter(CollectionUtils::isNotEmpty) .ifPresent(statistics -> statistics.stream() - .filter(s -> properties.containsKey(StatisticTemplateProperty.valueOfByName(s.getStatisticsField().getName()))) - .forEach(s -> properties.put(StatisticTemplateProperty.valueOfByName(s.getStatisticsField().getName()), String.valueOf(s.getCounter())))); + .filter( + s -> properties.containsKey(StatisticTemplateProperty.valueOfByName(s.getStatisticsField().getName()))) + .forEach(s -> properties.put(StatisticTemplateProperty.valueOfByName(s.getStatisticsField().getName()), + String.valueOf(s.getCounter())))); return properties; } diff --git a/src/main/java/com/epam/reportportal/extension/telegram/event/handler/EventHandler.java b/src/main/java/com/epam/reportportal/extension/telegram/event/handler/EventHandler.java index 3e706d4..75a753b 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/event/handler/EventHandler.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/event/handler/EventHandler.java @@ -5,5 +5,5 @@ */ public interface EventHandler { - void handle(T event); + void handle(T event); } diff --git a/src/main/java/com/epam/reportportal/extension/telegram/event/handler/plugin/PluginLoadedEventHandler.java b/src/main/java/com/epam/reportportal/extension/telegram/event/handler/plugin/PluginLoadedEventHandler.java index cc87298..b02fea5 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/event/handler/plugin/PluginLoadedEventHandler.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/event/handler/plugin/PluginLoadedEventHandler.java @@ -3,7 +3,7 @@ import com.epam.reportportal.extension.event.PluginEvent; import com.epam.reportportal.extension.telegram.event.handler.EventHandler; import com.epam.reportportal.extension.telegram.info.PluginInfoProvider; -import com.epam.ta.reportportal.dao.IntegrationTypeRepository; +import com.epam.reportportal.infrastructure.persistence.dao.IntegrationTypeRepository; /** * @author Andrei Piankouski diff --git a/src/main/java/com/epam/reportportal/extension/telegram/event/launch/TelegramLaunchFinishEventListener.java b/src/main/java/com/epam/reportportal/extension/telegram/event/launch/TelegramLaunchFinishEventListener.java index bbd76ec..63b3ff9 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/event/launch/TelegramLaunchFinishEventListener.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/event/launch/TelegramLaunchFinishEventListener.java @@ -18,15 +18,15 @@ import com.epam.reportportal.extension.event.LaunchFinishedPluginEvent; import com.epam.reportportal.extension.telegram.event.launch.resolver.AttachmentResolver; import com.epam.reportportal.extension.telegram.event.launch.resolver.SenderCaseMatcher; -import com.epam.reportportal.rules.exception.ErrorType; -import com.epam.reportportal.rules.exception.ReportPortalException; -import com.epam.ta.reportportal.dao.LaunchRepository; -import com.epam.ta.reportportal.dao.ProjectRepository; -import com.epam.ta.reportportal.entity.enums.ProjectAttributeEnum; -import com.epam.ta.reportportal.entity.launch.Launch; -import com.epam.ta.reportportal.entity.project.Project; -import com.epam.ta.reportportal.entity.project.ProjectUtils; -import com.epam.ta.reportportal.entity.project.email.SenderCase; +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 java.util.HashMap; import java.util.Map; import java.util.Optional; diff --git a/src/main/java/com/epam/reportportal/extension/telegram/event/launch/resolver/AttachmentResolver.java b/src/main/java/com/epam/reportportal/extension/telegram/event/launch/resolver/AttachmentResolver.java index 380b0b6..2c7ed03 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/event/launch/resolver/AttachmentResolver.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/event/launch/resolver/AttachmentResolver.java @@ -23,7 +23,7 @@ import com.epam.reportportal.extension.telegram.model.enums.SlackEventType; import com.epam.reportportal.extension.telegram.model.template.TemplateProperty; import com.epam.reportportal.extension.telegram.model.template.TextProperty; -import com.epam.ta.reportportal.entity.launch.Launch; +import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch; import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/com/epam/reportportal/extension/telegram/event/launch/resolver/SenderCaseMatcher.java b/src/main/java/com/epam/reportportal/extension/telegram/event/launch/resolver/SenderCaseMatcher.java index 01b4170..2b2ae41 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/event/launch/resolver/SenderCaseMatcher.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/event/launch/resolver/SenderCaseMatcher.java @@ -21,18 +21,18 @@ import static com.epam.reportportal.extension.telegram.model.enums.template.StatisticTemplateProperty.STATISTIC_EXECUTION_TOTAL; import com.epam.reportportal.extension.telegram.utils.NotificationConfigConverter; -import com.epam.ta.reportportal.dao.TestItemRepository; -import com.epam.ta.reportportal.entity.enums.LogicalOperator; -import com.epam.ta.reportportal.entity.enums.SendCase; -import com.epam.ta.reportportal.entity.launch.Launch; -import com.epam.ta.reportportal.entity.project.email.LaunchAttributeRule; -import com.epam.ta.reportportal.entity.project.email.SenderCase; -import com.epam.ta.reportportal.entity.statistics.Statistics; -import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource; +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 java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; /** * @author Andrei Piankouski diff --git a/src/main/java/com/epam/reportportal/extension/telegram/event/plugin/PluginEventHandlerFactory.java b/src/main/java/com/epam/reportportal/extension/telegram/event/plugin/PluginEventHandlerFactory.java index 382e27a..b883803 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/event/plugin/PluginEventHandlerFactory.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/event/plugin/PluginEventHandlerFactory.java @@ -5,8 +5,7 @@ import com.epam.reportportal.extension.telegram.event.handler.EventHandler; import com.epam.reportportal.extension.telegram.event.handler.plugin.PluginLoadedEventHandler; import com.epam.reportportal.extension.telegram.info.PluginInfoProvider; -import com.epam.ta.reportportal.dao.IntegrationTypeRepository; - +import com.epam.reportportal.infrastructure.persistence.dao.IntegrationTypeRepository; import java.util.HashMap; import java.util.Map; @@ -20,7 +19,7 @@ public class PluginEventHandlerFactory implements EventHandlerFactory> eventHandlerMapping; public PluginEventHandlerFactory(IntegrationTypeRepository integrationTypeRepository, - PluginInfoProvider pluginInfoProvider) { + PluginInfoProvider pluginInfoProvider) { this.eventHandlerMapping = new HashMap<>(); this.eventHandlerMapping.put(LOAD_KEY, new PluginLoadedEventHandler(integrationTypeRepository, pluginInfoProvider) diff --git a/src/main/java/com/epam/reportportal/extension/telegram/event/plugin/PluginEventListener.java b/src/main/java/com/epam/reportportal/extension/telegram/event/plugin/PluginEventListener.java index f1a738d..41d3c7b 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/event/plugin/PluginEventListener.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/event/plugin/PluginEventListener.java @@ -1,11 +1,11 @@ package com.epam.reportportal.extension.telegram.event.plugin; +import static java.util.Optional.ofNullable; + import com.epam.reportportal.extension.event.PluginEvent; import com.epam.reportportal.extension.telegram.event.EventHandlerFactory; import org.springframework.context.ApplicationListener; -import static java.util.Optional.ofNullable; - /** * @author Andrei Piankouski */ @@ -22,12 +22,13 @@ public PluginEventListener(String pluginId, EventHandlerFactory plu @Override public void onApplicationEvent(PluginEvent event) { if (supports(event)) { - ofNullable(pluginEventEventHandlerFactory.getEventHandler(event.getType())).ifPresent(pluginEventEventHandler -> pluginEventEventHandler - .handle(event)); + ofNullable(pluginEventEventHandlerFactory.getEventHandler(event.getType())).ifPresent( + pluginEventEventHandler -> pluginEventEventHandler + .handle(event)); } } private boolean supports(PluginEvent event) { return pluginId.equals(event.getPluginId()); } -} \ No newline at end of file +} diff --git a/src/main/java/com/epam/reportportal/extension/telegram/factory/PropertyCollectorFactory.java b/src/main/java/com/epam/reportportal/extension/telegram/factory/PropertyCollectorFactory.java index 12d0b6b..ca8026e 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/factory/PropertyCollectorFactory.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/factory/PropertyCollectorFactory.java @@ -6,7 +6,7 @@ import com.epam.reportportal.extension.telegram.collector.laucnh.ResultColorCollector; import com.epam.reportportal.extension.telegram.collector.laucnh.StatisticsPropertiesCollector; import com.epam.reportportal.extension.telegram.model.template.TemplateProperty; -import com.epam.ta.reportportal.entity.launch.Launch; +import com.epam.reportportal.infrastructure.persistence.entity.launch.Launch; import java.util.List; public class PropertyCollectorFactory { diff --git a/src/main/java/com/epam/reportportal/extension/telegram/info/PluginInfoProvider.java b/src/main/java/com/epam/reportportal/extension/telegram/info/PluginInfoProvider.java index eaee9ac..48643a4 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/info/PluginInfoProvider.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/info/PluginInfoProvider.java @@ -1,6 +1,6 @@ package com.epam.reportportal.extension.telegram.info; -import com.epam.ta.reportportal.entity.integration.IntegrationType; +import com.epam.reportportal.infrastructure.persistence.entity.integration.IntegrationType; /** * @author Ivan Budayeu diff --git a/src/main/java/com/epam/reportportal/extension/telegram/info/impl/PluginInfoProviderImpl.java b/src/main/java/com/epam/reportportal/extension/telegram/info/impl/PluginInfoProviderImpl.java index 40f541d..5e4a72a 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/info/impl/PluginInfoProviderImpl.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/info/impl/PluginInfoProviderImpl.java @@ -3,10 +3,10 @@ import static java.util.Optional.ofNullable; import com.epam.reportportal.extension.telegram.info.PluginInfoProvider; -import com.epam.reportportal.rules.exception.ErrorType; -import com.epam.reportportal.rules.exception.ReportPortalException; -import com.epam.ta.reportportal.entity.enums.IntegrationGroupEnum; -import com.epam.ta.reportportal.entity.integration.IntegrationType; +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 java.io.IOException; import java.io.InputStream; import java.nio.file.Files; diff --git a/src/main/java/com/epam/reportportal/extension/telegram/model/enums/SlackEventType.java b/src/main/java/com/epam/reportportal/extension/telegram/model/enums/SlackEventType.java index 4a88125..19b8e35 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/model/enums/SlackEventType.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/model/enums/SlackEventType.java @@ -2,7 +2,7 @@ import static java.util.Optional.ofNullable; -import com.epam.ta.reportportal.entity.integration.Integration; +import com.epam.reportportal.infrastructure.persistence.entity.integration.Integration; import java.util.Optional; public enum SlackEventType { diff --git a/src/main/java/com/epam/reportportal/extension/telegram/model/enums/SlackIntegrationProperties.java b/src/main/java/com/epam/reportportal/extension/telegram/model/enums/SlackIntegrationProperties.java index 8676135..a7ab55c 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/model/enums/SlackIntegrationProperties.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/model/enums/SlackIntegrationProperties.java @@ -2,7 +2,7 @@ import static java.util.Optional.ofNullable; -import com.epam.ta.reportportal.entity.integration.Integration; +import com.epam.reportportal.infrastructure.persistence.entity.integration.Integration; import java.util.Optional; public enum SlackIntegrationProperties { diff --git a/src/main/java/com/epam/reportportal/extension/telegram/model/enums/template/StatisticTemplateProperty.java b/src/main/java/com/epam/reportportal/extension/telegram/model/enums/template/StatisticTemplateProperty.java index 3278c50..b1b5590 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/model/enums/template/StatisticTemplateProperty.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/model/enums/template/StatisticTemplateProperty.java @@ -9,7 +9,7 @@ public enum StatisticTemplateProperty implements TemplateProperty { STATISTIC_EXECUTION_FAILED("statistics$executions$failed"), STATISTIC_EXECUTION_SKIPPED("statistics$executions$skipped"), STATISTIC_DEFECTS_PRODUCT_BUG("statistics$defects$product_bug$total"), - STATISTIC_DEFECTS_SYSTEM_ISSUE ("statistics$defects$system_issue$total"), + STATISTIC_DEFECTS_SYSTEM_ISSUE("statistics$defects$system_issue$total"), STATISTIC_DEFECTS_AUTOMATION_BUG("statistics$defects$automation_bug$total"), STATISTIC_DEFECTS_NO_DEFECT("statistics$defects$no_defect$total"), STATISTIC_DEFECTS_TO_INVESTIGATE("statistics$defects$to_investigate$total"), diff --git a/src/main/java/com/epam/reportportal/extension/telegram/utils/MemoizingSupplier.java b/src/main/java/com/epam/reportportal/extension/telegram/utils/MemoizingSupplier.java index 9ccb99c..a973de2 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/utils/MemoizingSupplier.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/utils/MemoizingSupplier.java @@ -1,38 +1,38 @@ package com.epam.reportportal.extension.telegram.utils; +import static com.google.common.base.Preconditions.checkNotNull; + import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; -import static com.google.common.base.Preconditions.checkNotNull; - /** * @author Andrei Piankouski */ public class MemoizingSupplier implements Supplier { - private final Supplier delegate; + private final Supplier delegate; - private AtomicBoolean initialized = new AtomicBoolean(false); + private AtomicBoolean initialized = new AtomicBoolean(false); - private T value; + private T value; - public MemoizingSupplier(Supplier delegate) { - this.delegate = checkNotNull(delegate); - } + public MemoizingSupplier(Supplier delegate) { + this.delegate = checkNotNull(delegate); + } - @Override - public T get() { + @Override + public T get() { + if (!initialized.get()) { + synchronized (this) { if (!initialized.get()) { - synchronized (this) { - if (!initialized.get()) { - T t = delegate.get(); - value = t; - initialized.set(true); - return t; - } - } + T t = delegate.get(); + value = t; + initialized.set(true); + return t; } - return value; + } } + return value; + } } diff --git a/src/main/java/com/epam/reportportal/extension/telegram/utils/NotificationConfigConverter.java b/src/main/java/com/epam/reportportal/extension/telegram/utils/NotificationConfigConverter.java index e77ad75..70242c5 100644 --- a/src/main/java/com/epam/reportportal/extension/telegram/utils/NotificationConfigConverter.java +++ b/src/main/java/com/epam/reportportal/extension/telegram/utils/NotificationConfigConverter.java @@ -16,8 +16,8 @@ package com.epam.reportportal.extension.telegram.utils; -import com.epam.ta.reportportal.entity.project.email.LaunchAttributeRule; -import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource; +import com.epam.reportportal.infrastructure.persistence.entity.project.email.LaunchAttributeRule; +import com.epam.reportportal.reporting.ItemAttributeResource; import java.util.function.Function; /**