diff --git a/bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/CommentAndTaskParser.java b/bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/CommentAndTaskParser.java index 75ea642..3c58f6d 100644 --- a/bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/CommentAndTaskParser.java +++ b/bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/CommentAndTaskParser.java @@ -1,9 +1,6 @@ package org.sadtech.bot.vcs.bitbucket.app.service; import lombok.NonNull; -import org.sadtech.basic.context.exception.NotFoundException; -import org.sadtech.basic.context.page.Sheet; -import org.sadtech.basic.core.page.PaginationImpl; import org.sadtech.bot.vcs.bitbucket.app.config.property.CommentSchedulerProperty; import org.sadtech.bot.vcs.bitbucket.app.service.executor.DataScan; import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson; @@ -15,9 +12,12 @@ import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Comment; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequest; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequestMini; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Task; +import org.sadtech.bot.vsc.bitbucketbot.context.exception.NotFoundException; import org.sadtech.bot.vsc.bitbucketbot.context.service.CommentService; import org.sadtech.bot.vsc.bitbucketbot.context.service.PullRequestsService; import org.sadtech.bot.vsc.bitbucketbot.context.service.TaskService; +import org.sadtech.haiti.context.page.Sheet; +import org.sadtech.haiti.core.page.PaginationImpl; import org.springframework.core.convert.ConversionService; import org.springframework.stereotype.Component; diff --git a/bitbucketbot-context/pom.xml b/bitbucketbot-context/pom.xml index 46889e0..7fec40a 100644 --- a/bitbucketbot-context/pom.xml +++ b/bitbucketbot-context/pom.xml @@ -19,9 +19,13 @@ - org.sadtech.basic - project-context - 0.1.0-SNAPSHOT + org.sadtech.haiti + haiti-context + + + + org.sadtech.haiti.filter + criteria-filter @@ -32,7 +36,6 @@ org.sadtech.bot.vcs vcs-bot-context - 0.0.1-DEVELOP diff --git a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/AnswerCommentNotify.java b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/AnswerCommentNotify.java index 58f3ef5..b5dfc3e 100644 --- a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/AnswerCommentNotify.java +++ b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/AnswerCommentNotify.java @@ -41,7 +41,7 @@ public class AnswerCommentNotify extends Notify { "{0} *Новые ответы* на [комментарий]({1}){2}" + "{3}{2}" + "{4}", - Smile.BELL, + Smile.COMMENT, url, Smile.HR, escapeMarkdown(youMessage.substring(0, Math.min(youMessage.length(), 180))), diff --git a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/CommentNotify.java b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/CommentNotify.java index 1a41f06..c1ae43b 100644 --- a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/CommentNotify.java +++ b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/CommentNotify.java @@ -34,7 +34,7 @@ public class CommentNotify extends Notify { return MessageFormat.format( "{0} *Новое упоминание* | [ПР]({1}){2}" + "*{3}*: {4}", - Smile.BELL, url, Smile.HR, authorName, escapeMarkdown(message) + Smile.COMMENT, url, Smile.HR, authorName, escapeMarkdown(message) ); } diff --git a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/ChatRepository.java b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/ChatRepository.java index 115a115..d855b27 100644 --- a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/ChatRepository.java +++ b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/ChatRepository.java @@ -1,8 +1,8 @@ package org.sadtech.bot.vsc.bitbucketbot.context.repository; import lombok.NonNull; -import org.sadtech.basic.context.repository.SimpleManagerRepository; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Chat; +import org.sadtech.haiti.context.repository.SimpleManagerRepository; import java.util.Set; diff --git a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/CommentRepository.java b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/CommentRepository.java index da6e7b8..fc0b256 100644 --- a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/CommentRepository.java +++ b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/CommentRepository.java @@ -1,8 +1,8 @@ package org.sadtech.bot.vsc.bitbucketbot.context.repository; import lombok.NonNull; -import org.sadtech.basic.context.repository.SimpleManagerRepository; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Comment; +import org.sadtech.haiti.context.repository.SimpleManagerRepository; import java.time.LocalDateTime; import java.util.List; diff --git a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/NotifySettingRepository.java b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/NotifySettingRepository.java index 7c34deb..0b13523 100644 --- a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/NotifySettingRepository.java +++ b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/NotifySettingRepository.java @@ -1,8 +1,8 @@ package org.sadtech.bot.vsc.bitbucketbot.context.repository; import lombok.NonNull; -import org.sadtech.basic.context.repository.SimpleManagerRepository; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.NotifySetting; +import org.sadtech.haiti.context.repository.SimpleManagerRepository; import java.util.Set; diff --git a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/PullRequestsRepository.java b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/PullRequestsRepository.java index f66e95d..e9491b4 100644 --- a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/PullRequestsRepository.java +++ b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/PullRequestsRepository.java @@ -1,13 +1,13 @@ package org.sadtech.bot.vsc.bitbucketbot.context.repository; import lombok.NonNull; -import org.sadtech.basic.context.repository.SimpleManagerRepository; -import org.sadtech.basic.context.repository.simple.FilterOperation; import org.sadtech.bot.vsc.bitbucketbot.context.domain.IdAndStatusPr; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequest; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequestMini; import org.sadtech.bot.vsc.context.domain.PullRequestStatus; import org.sadtech.bot.vsc.context.domain.ReviewerStatus; +import org.sadtech.haiti.context.repository.SimpleManagerRepository; +import org.sadtech.haiti.filter.FilterOperation; import java.util.List; import java.util.Optional; diff --git a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingHistoryRepository.java b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingHistoryRepository.java index 0ee82f7..03bf23a 100644 --- a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingHistoryRepository.java +++ b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingHistoryRepository.java @@ -1,8 +1,8 @@ package org.sadtech.bot.vsc.bitbucketbot.context.repository; import lombok.NonNull; -import org.sadtech.basic.context.repository.SimpleManagerRepository; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.RatingHistory; +import org.sadtech.haiti.context.repository.SimpleManagerRepository; import java.time.LocalDateTime; import java.util.List; diff --git a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingListRepository.java b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingListRepository.java index 0eaef3f..1cc223a 100644 --- a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingListRepository.java +++ b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingListRepository.java @@ -1,7 +1,7 @@ package org.sadtech.bot.vsc.bitbucketbot.context.repository; -import org.sadtech.basic.context.repository.SimpleManagerRepository; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.RatingList; +import org.sadtech.haiti.context.repository.SimpleManagerRepository; import java.util.List; import java.util.Optional; diff --git a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/TaskRepository.java b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/TaskRepository.java index d6d8d73..8ee3a7b 100644 --- a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/TaskRepository.java +++ b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/TaskRepository.java @@ -1,9 +1,9 @@ package org.sadtech.bot.vsc.bitbucketbot.context.repository; import lombok.NonNull; -import org.sadtech.basic.context.repository.SimpleManagerRepository; import org.sadtech.bot.vsc.bitbucketbot.context.domain.TaskStatus; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Task; +import org.sadtech.haiti.context.repository.SimpleManagerRepository; import java.time.LocalDateTime; import java.util.List; diff --git a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/CommentService.java b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/CommentService.java index d63bc98..1962e68 100644 --- a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/CommentService.java +++ b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/CommentService.java @@ -1,9 +1,9 @@ package org.sadtech.bot.vsc.bitbucketbot.context.service; import lombok.NonNull; -import org.sadtech.basic.context.service.SimpleManagerService; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Comment; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Task; +import org.sadtech.haiti.context.service.SimpleManagerService; import java.time.LocalDateTime; import java.util.List; diff --git a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PullRequestsService.java b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PullRequestsService.java index eaf6a5f..4760332 100644 --- a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PullRequestsService.java +++ b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PullRequestsService.java @@ -1,14 +1,14 @@ package org.sadtech.bot.vsc.bitbucketbot.context.service; import lombok.NonNull; -import org.sadtech.basic.context.service.SimpleManagerService; -import org.sadtech.basic.context.service.simple.FilterService; import org.sadtech.bot.vsc.bitbucketbot.context.domain.IdAndStatusPr; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequest; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequestMini; import org.sadtech.bot.vsc.bitbucketbot.context.domain.filter.PullRequestFilter; import org.sadtech.bot.vsc.context.domain.PullRequestStatus; import org.sadtech.bot.vsc.context.domain.ReviewerStatus; +import org.sadtech.haiti.context.service.SimpleManagerService; +import org.sadtech.haiti.context.service.simple.FilterService; import java.util.List; import java.util.Optional; diff --git a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/TaskService.java b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/TaskService.java index 0aadfe3..f059677 100644 --- a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/TaskService.java +++ b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/TaskService.java @@ -1,10 +1,10 @@ package org.sadtech.bot.vsc.bitbucketbot.context.service; import lombok.NonNull; -import org.sadtech.basic.context.service.SimpleManagerService; import org.sadtech.bot.vsc.bitbucketbot.context.domain.TaskStatus; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Comment; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Task; +import org.sadtech.haiti.context.service.SimpleManagerService; import java.time.LocalDateTime; import java.util.List; diff --git a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/Smile.java b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/Smile.java index b6b055a..d5d929d 100644 --- a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/Smile.java +++ b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/Smile.java @@ -33,7 +33,7 @@ public enum Smile { KAKASHKA("\uD83D\uDCA9"), LUPA("\uD83D\uDD0D"), DANGEROUS("⚠️"), - BELL("\uD83D\uDECE"), + COMMENT("\uD83D\uDCAC"), ARROW("➜"), HR("\n -- -- -- -- --\n"), FAILURE("❌"), diff --git a/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/CommentJsonToTaskConvert.java b/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/CommentJsonToTaskConvert.java index 7b5dbb7..6c9fac4 100644 --- a/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/CommentJsonToTaskConvert.java +++ b/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/CommentJsonToTaskConvert.java @@ -1,12 +1,12 @@ package org.sadtech.bot.vcs.bitbucket.core.service.converter; -import org.sadtech.basic.context.exception.ConvertException; import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson; import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentState; import org.sadtech.bot.vcs.bitbucket.sdk.domain.Severity; import org.sadtech.bot.vcs.core.utils.StringUtils; import org.sadtech.bot.vsc.bitbucketbot.context.domain.TaskStatus; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Task; +import org.sadtech.haiti.context.exception.ConvertException; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/PullRequestJsonConverter.java b/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/PullRequestJsonConverter.java index ec3845b..b80ecf3 100644 --- a/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/PullRequestJsonConverter.java +++ b/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/PullRequestJsonConverter.java @@ -1,7 +1,6 @@ package org.sadtech.bot.vcs.bitbucket.core.service.converter; import lombok.RequiredArgsConstructor; -import org.sadtech.basic.context.exception.ConvertException; import org.sadtech.bot.vcs.bitbucket.sdk.domain.Outcome; import org.sadtech.bot.vcs.bitbucket.sdk.domain.Properties; import org.sadtech.bot.vcs.bitbucket.sdk.domain.PullRequestJson; @@ -13,6 +12,7 @@ import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequest; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Reviewer; import org.sadtech.bot.vsc.context.domain.PullRequestStatus; import org.sadtech.bot.vsc.context.domain.ReviewerStatus; +import org.sadtech.haiti.context.exception.ConvertException; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/bitbucketbot-data/pom.xml b/bitbucketbot-data/pom.xml index d331e1d..88e8dc5 100644 --- a/bitbucketbot-data/pom.xml +++ b/bitbucketbot-data/pom.xml @@ -16,15 +16,14 @@ org.sadtech.bot.bitbucketbot bitbucketbot-context - 3.0.1-SNAPSHOT org.springframework.data spring-data-jpa - org.sadtech.basic - project-database + org.sadtech.haiti + haiti-database diff --git a/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/ChatRepositoryImpl.java b/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/ChatRepositoryImpl.java index 93fd5bd..44922ce 100644 --- a/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/ChatRepositoryImpl.java +++ b/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/ChatRepositoryImpl.java @@ -1,10 +1,10 @@ package org.sadtech.bot.vcs.bitbucketbot.data.impl; import lombok.NonNull; -import org.sadtech.basic.database.repository.manager.AbstractSimpleManagerRepository; import org.sadtech.bot.vcs.bitbucketbot.data.jpa.ChatJpaRepository; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Chat; import org.sadtech.bot.vsc.bitbucketbot.context.repository.ChatRepository; +import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; import java.util.Set; diff --git a/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/CommentRepositoryImpl.java b/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/CommentRepositoryImpl.java index 0814fc5..858f05c 100644 --- a/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/CommentRepositoryImpl.java +++ b/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/CommentRepositoryImpl.java @@ -1,10 +1,10 @@ package org.sadtech.bot.vcs.bitbucketbot.data.impl; import lombok.NonNull; -import org.sadtech.basic.database.repository.manager.AbstractSimpleManagerRepository; import org.sadtech.bot.vcs.bitbucketbot.data.jpa.CommentRepositoryJpa; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Comment; import org.sadtech.bot.vsc.bitbucketbot.context.repository.CommentRepository; +import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; import java.time.LocalDateTime; diff --git a/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/NotifySettingRepositoryImpl.java b/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/NotifySettingRepositoryImpl.java index 13ef668..2677bc9 100644 --- a/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/NotifySettingRepositoryImpl.java +++ b/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/NotifySettingRepositoryImpl.java @@ -1,10 +1,10 @@ package org.sadtech.bot.vcs.bitbucketbot.data.impl; import lombok.NonNull; -import org.sadtech.basic.database.repository.manager.AbstractSimpleManagerRepository; import org.sadtech.bot.vcs.bitbucketbot.data.jpa.NotifySettingJpaRepository; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.NotifySetting; import org.sadtech.bot.vsc.bitbucketbot.context.repository.NotifySettingRepository; +import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; import java.time.LocalDateTime; diff --git a/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/PullRequestsRepositoryImpl.java b/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/PullRequestsRepositoryImpl.java index ba30250..7e6d37e 100644 --- a/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/PullRequestsRepositoryImpl.java +++ b/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/PullRequestsRepositoryImpl.java @@ -1,7 +1,6 @@ package org.sadtech.bot.vcs.bitbucketbot.data.impl; import lombok.NonNull; -import org.sadtech.basic.database.repository.manager.FilterManagerRepository; import org.sadtech.bot.vcs.bitbucketbot.data.jpa.PullRequestMiniRepositoryJpa; import org.sadtech.bot.vcs.bitbucketbot.data.jpa.PullRequestsRepositoryJpa; import org.sadtech.bot.vsc.bitbucketbot.context.domain.IdAndStatusPr; @@ -10,6 +9,7 @@ import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequestMini; import org.sadtech.bot.vsc.bitbucketbot.context.repository.PullRequestsRepository; import org.sadtech.bot.vsc.context.domain.PullRequestStatus; import org.sadtech.bot.vsc.context.domain.ReviewerStatus; +import org.sadtech.haiti.database.repository.manager.FilterManagerRepository; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingHistoryRepositoryImpl.java b/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingHistoryRepositoryImpl.java index 7c33498..9a0e8cd 100644 --- a/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingHistoryRepositoryImpl.java +++ b/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingHistoryRepositoryImpl.java @@ -1,10 +1,10 @@ package org.sadtech.bot.vcs.bitbucketbot.data.impl; import lombok.NonNull; -import org.sadtech.basic.database.repository.manager.AbstractSimpleManagerRepository; import org.sadtech.bot.vcs.bitbucketbot.data.jpa.RatingHistoryJpaRepository; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.RatingHistory; import org.sadtech.bot.vsc.bitbucketbot.context.repository.RatingHistoryRepository; +import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; import java.time.LocalDateTime; diff --git a/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingListRepositoryImpl.java b/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingListRepositoryImpl.java index f3bd85c..285c6be 100644 --- a/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingListRepositoryImpl.java +++ b/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingListRepositoryImpl.java @@ -1,9 +1,9 @@ package org.sadtech.bot.vcs.bitbucketbot.data.impl; -import org.sadtech.basic.database.repository.manager.AbstractSimpleManagerRepository; import org.sadtech.bot.vcs.bitbucketbot.data.jpa.RatingListJpaRepository; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.RatingList; import org.sadtech.bot.vsc.bitbucketbot.context.repository.RatingListRepository; +import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/TaskRepositoryImpl.java b/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/TaskRepositoryImpl.java index 96497a3..da6510c 100644 --- a/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/TaskRepositoryImpl.java +++ b/bitbucketbot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/TaskRepositoryImpl.java @@ -1,11 +1,11 @@ package org.sadtech.bot.vcs.bitbucketbot.data.impl; import lombok.NonNull; -import org.sadtech.basic.database.repository.manager.AbstractSimpleManagerRepository; import org.sadtech.bot.vcs.bitbucketbot.data.jpa.TaskRepositoryJpa; import org.sadtech.bot.vsc.bitbucketbot.context.domain.TaskStatus; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Task; import org.sadtech.bot.vsc.bitbucketbot.context.repository.TaskRepository; +import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; import java.time.LocalDateTime; diff --git a/bot-core/pom.xml b/bot-core/pom.xml index 74452dd..bf936a7 100644 --- a/bot-core/pom.xml +++ b/bot-core/pom.xml @@ -14,19 +14,18 @@ - org.sadtech.basic.filter + org.sadtech.haiti.filter criteria-filter org.sadtech.bot.bitbucketbot bitbucketbot-context - 3.0.1-SNAPSHOT - org.sadtech.basic - project-database + org.sadtech.haiti + haiti-database diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/CommentServiceImpl.java b/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/CommentServiceImpl.java index 4ecd9bd..d7fab8a 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/CommentServiceImpl.java +++ b/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/CommentServiceImpl.java @@ -1,8 +1,6 @@ package org.sadtech.bot.vcs.core.service.impl; import lombok.NonNull; -import org.sadtech.basic.core.service.AbstractSimpleManagerService; -import org.sadtech.basic.core.util.Assert; import org.sadtech.bot.vsc.bitbucketbot.context.domain.Answer; import org.sadtech.bot.vsc.bitbucketbot.context.domain.PointType; import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Comment; @@ -15,6 +13,8 @@ import org.sadtech.bot.vsc.bitbucketbot.context.service.CommentService; import org.sadtech.bot.vsc.bitbucketbot.context.service.NotifyService; import org.sadtech.bot.vsc.bitbucketbot.context.service.RatingService; import org.sadtech.bot.vsc.bitbucketbot.context.service.TaskService; +import org.sadtech.haiti.core.service.AbstractSimpleManagerService; +import org.sadtech.haiti.core.util.Assert; import org.springframework.context.annotation.Lazy; import org.springframework.core.convert.ConversionService; import org.springframework.stereotype.Service; @@ -163,5 +163,4 @@ public class CommentServiceImpl extends AbstractSimpleManagerService3.0.0-RELEASE 3.0.0-RELEASE + 0.0.1-SNAPSHOT + 0.0.1-SNAPSHOT 0.0.1-DEVELOPER + 0.0.1-DEVELOP - 0.1.0-SNAPSHOT + 0.0.1-SNAPSHOT 0.1.0-SNAPSHOT 2.2 @@ -102,9 +105,9 @@ - org.sadtech.basic - project-database - ${sadtech.project.database.version} + org.sadtech.haiti + haiti-database + ${org.sadtech.haiti.database.version} @@ -113,6 +116,24 @@ ${org.sadtech.telegram.bot-core.version} + + org.sadtech.haiti + haiti-context + ${org.sadtech.haiti.context.version} + + + + org.sadtech.bot.vcs + vcs-bot-context + ${org.sadtech.bot.vsc.context.version} + + + + org.sadtech.haiti.filter + criteria-filter + ${org.sadtech.haiti.filter.version} + + org.hibernate.orm hibernate-jpamodelgen diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/BuildShortRepository.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/BuildShortRepository.java index e9b976b..a050c9a 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/BuildShortRepository.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/BuildShortRepository.java @@ -1,8 +1,8 @@ package org.sadtech.bot.vcs.teamcity.core.repository; import lombok.NonNull; -import org.sadtech.basic.context.repository.SimpleManagerRepository; import org.sadtech.bot.vcs.teamcity.core.domain.entity.BuildShort; +import org.sadtech.haiti.context.repository.SimpleManagerRepository; import java.util.Set; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/TeamcityProjectRepository.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/TeamcityProjectRepository.java index 05b2366..c0941da 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/TeamcityProjectRepository.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/TeamcityProjectRepository.java @@ -1,8 +1,8 @@ package org.sadtech.bot.vcs.teamcity.core.repository; import lombok.NonNull; -import org.sadtech.basic.context.repository.SimpleManagerRepository; import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcityProject; +import org.sadtech.haiti.context.repository.SimpleManagerRepository; import java.util.List; import java.util.Set; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/TeamcitySettingRepository.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/TeamcitySettingRepository.java index 9839f3f..cda2299 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/TeamcitySettingRepository.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/TeamcitySettingRepository.java @@ -1,8 +1,8 @@ package org.sadtech.bot.vcs.teamcity.core.repository; import lombok.NonNull; -import org.sadtech.basic.context.repository.SimpleManagerRepository; import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcitySetting; +import org.sadtech.haiti.context.repository.SimpleManagerRepository; import java.util.List; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/impl/BuildShortRepositoryImpl.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/impl/BuildShortRepositoryImpl.java index 0c5f555..20ef468 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/impl/BuildShortRepositoryImpl.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/impl/BuildShortRepositoryImpl.java @@ -1,10 +1,10 @@ package org.sadtech.bot.vcs.teamcity.core.repository.impl; import lombok.NonNull; -import org.sadtech.basic.database.repository.manager.AbstractSimpleManagerRepository; import org.sadtech.bot.vcs.teamcity.core.domain.entity.BuildShort; import org.sadtech.bot.vcs.teamcity.core.repository.BuildShortRepository; import org.sadtech.bot.vcs.teamcity.core.repository.jpa.BuildShortJpaRepository; +import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; import java.util.Set; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/impl/TeamcityProjectRepositoryImpl.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/impl/TeamcityProjectRepositoryImpl.java index b5c1f01..80f250e 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/impl/TeamcityProjectRepositoryImpl.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/impl/TeamcityProjectRepositoryImpl.java @@ -1,10 +1,10 @@ package org.sadtech.bot.vcs.teamcity.core.repository.impl; import lombok.NonNull; -import org.sadtech.basic.database.repository.manager.AbstractSimpleManagerRepository; import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcityProject; import org.sadtech.bot.vcs.teamcity.core.repository.TeamcityProjectRepository; import org.sadtech.bot.vcs.teamcity.core.repository.jpa.TeamcityProjectJpaRepository; +import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/impl/TeamcitySettingRepositoryImpl.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/impl/TeamcitySettingRepositoryImpl.java index 55beb00..855ffda 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/impl/TeamcitySettingRepositoryImpl.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/impl/TeamcitySettingRepositoryImpl.java @@ -1,10 +1,10 @@ package org.sadtech.bot.vcs.teamcity.core.repository.impl; import lombok.NonNull; -import org.sadtech.basic.database.repository.manager.AbstractSimpleManagerRepository; import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcitySetting; import org.sadtech.bot.vcs.teamcity.core.repository.TeamcitySettingRepository; import org.sadtech.bot.vcs.teamcity.core.repository.jpa.TeamcitySettingJpaRepository; +import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/BuildShortService.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/BuildShortService.java index fd9a90a..8d0058d 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/BuildShortService.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/BuildShortService.java @@ -1,7 +1,7 @@ package org.sadtech.bot.vcs.teamcity.core.service; -import org.sadtech.basic.context.service.SimpleManagerService; import org.sadtech.bot.vcs.teamcity.core.domain.entity.BuildShort; +import org.sadtech.haiti.context.service.SimpleManagerService; import java.util.Set; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/TeamcityProjectService.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/TeamcityProjectService.java index 6e29553..7431956 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/TeamcityProjectService.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/TeamcityProjectService.java @@ -1,8 +1,8 @@ package org.sadtech.bot.vcs.teamcity.core.service; import lombok.NonNull; -import org.sadtech.basic.context.service.SimpleManagerService; import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcityProject; +import org.sadtech.haiti.context.service.SimpleManagerService; import java.util.List; import java.util.Set; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/TeamcitySettingService.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/TeamcitySettingService.java index 5ecfc8a..ca981d2 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/TeamcitySettingService.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/TeamcitySettingService.java @@ -1,8 +1,8 @@ package org.sadtech.bot.vcs.teamcity.core.service; import lombok.NonNull; -import org.sadtech.basic.context.service.SimpleManagerService; import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcitySetting; +import org.sadtech.haiti.context.service.SimpleManagerService; import java.util.List; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/impl/BuildShortServiceImpl.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/impl/BuildShortServiceImpl.java index dd1c1f1..43f4954 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/impl/BuildShortServiceImpl.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/impl/BuildShortServiceImpl.java @@ -1,7 +1,6 @@ package org.sadtech.bot.vcs.teamcity.core.service.impl; import lombok.NonNull; -import org.sadtech.basic.core.service.AbstractSimpleManagerService; import org.sadtech.bot.vcs.teamcity.core.domain.TeamcityBuildNotify; import org.sadtech.bot.vcs.teamcity.core.domain.entity.BuildShort; import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcitySetting; @@ -10,6 +9,7 @@ import org.sadtech.bot.vcs.teamcity.core.service.BuildShortService; import org.sadtech.bot.vcs.teamcity.core.service.TeamcitySettingService; import org.sadtech.bot.vcs.teamcity.sdk.BuildStatus; import org.sadtech.bot.vsc.bitbucketbot.context.service.NotifyService; +import org.sadtech.haiti.core.service.AbstractSimpleManagerService; import org.springframework.stereotype.Service; import java.util.Collections; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/impl/TeamcityProjectServiceImpl.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/impl/TeamcityProjectServiceImpl.java index b0d224f..be25429 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/impl/TeamcityProjectServiceImpl.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/impl/TeamcityProjectServiceImpl.java @@ -1,10 +1,10 @@ package org.sadtech.bot.vcs.teamcity.core.service.impl; import lombok.NonNull; -import org.sadtech.basic.core.service.AbstractSimpleManagerService; import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcityProject; import org.sadtech.bot.vcs.teamcity.core.repository.TeamcityProjectRepository; import org.sadtech.bot.vcs.teamcity.core.service.TeamcityProjectService; +import org.sadtech.haiti.core.service.AbstractSimpleManagerService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/impl/TeamcitySettingServiceImpl.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/impl/TeamcitySettingServiceImpl.java index 354a70b..bb0314f 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/impl/TeamcitySettingServiceImpl.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/impl/TeamcitySettingServiceImpl.java @@ -1,10 +1,10 @@ package org.sadtech.bot.vcs.teamcity.core.service.impl; import lombok.NonNull; -import org.sadtech.basic.core.service.AbstractSimpleManagerService; import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcitySetting; import org.sadtech.bot.vcs.teamcity.core.repository.TeamcitySettingRepository; import org.sadtech.bot.vcs.teamcity.core.service.TeamcitySettingService; +import org.sadtech.haiti.core.service.AbstractSimpleManagerService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/parser/BuildShortParser.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/parser/BuildShortParser.java index 3de1d47..0aae4ee 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/parser/BuildShortParser.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/parser/BuildShortParser.java @@ -7,8 +7,6 @@ package org.sadtech.bot.vcs.teamcity.core.service.parser; */ import lombok.RequiredArgsConstructor; -import org.sadtech.basic.context.page.Sheet; -import org.sadtech.basic.core.page.PaginationImpl; import org.sadtech.bot.vcs.core.utils.Utils; import org.sadtech.bot.vcs.teamcity.core.config.property.TeamcityProperty; import org.sadtech.bot.vcs.teamcity.core.domain.entity.BuildShort; @@ -17,6 +15,8 @@ import org.sadtech.bot.vcs.teamcity.core.service.BuildShortService; import org.sadtech.bot.vcs.teamcity.core.service.TeamcityProjectService; import org.sadtech.bot.vcs.teamcity.sdk.BuildShortJson; import org.sadtech.bot.vcs.teamcity.sdk.sheet.BuildShortJsonSheet; +import org.sadtech.haiti.context.page.Sheet; +import org.sadtech.haiti.core.page.PaginationImpl; import org.springframework.core.convert.ConversionService; import org.springframework.stereotype.Service;