Множественный рефакторинг

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;
 

bitbucketbot-context/pom.xml

@@ -19,9 +19,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.sadtech.basic</groupId>
+            <groupId>org.sadtech.haiti</groupId>
-            <artifactId>project-context</artifactId>
+            <artifactId>haiti-context</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.sadtech.haiti.filter</groupId>
+            <artifactId>criteria-filter</artifactId>
         </dependency>
 
         <dependency>
@@ -32,7 +36,6 @@
         <dependency>
             <groupId>org.sadtech.bot.vcs</groupId>
             <artifactId>vcs-bot-context</artifactId>
-            <version>0.0.1-DEVELOP</version>
         </dependency>
 
         <dependency>

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))),

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)
         );
     }
 

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;
 

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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("❌"),

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;
 

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;
 

bitbucketbot-data/pom.xml

@@ -16,15 +16,14 @@
         <dependency>
             <groupId>org.sadtech.bot.bitbucketbot</groupId>
             <artifactId>bitbucketbot-context</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.sadtech.basic</groupId>
+            <groupId>org.sadtech.haiti</groupId>
-            <artifactId>project-database</artifactId>
+            <artifactId>haiti-database</artifactId>
         </dependency>
     </dependencies>
 

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;

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;

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;

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;

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;

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;

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;

bot-core/pom.xml

@@ -14,19 +14,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.sadtech.basic.filter</groupId>
+            <groupId>org.sadtech.haiti.filter</groupId>
             <artifactId>criteria-filter</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.sadtech.bot.bitbucketbot</groupId>
             <artifactId>bitbucketbot-context</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
-            <groupId>org.sadtech.basic</groupId>
+            <groupId>org.sadtech.haiti</groupId>
-            <artifactId>project-database</artifactId>
+            <artifactId>haiti-database</artifactId>
         </dependency>
 
         <dependency>

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 AbstractSimpleManagerService<Comment, Lo
         ratingService.addRating(comment.getAuthor(), PointType.COMMENT_DELETE, PointType.COMMENT_DELETE.getPoints());
         super.deleteById(id);
     }
-
 }

bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/PersonServiceImpl.java

@@ -2,7 +2,6 @@ package org.sadtech.bot.vcs.core.service.impl;
 
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
-import org.sadtech.basic.core.util.Assert;
 import org.sadtech.bot.vcs.core.config.properties.BitbucketProperty;
 import org.sadtech.bot.vcs.core.utils.Utils;
 import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.NotifySetting;
@@ -11,6 +10,7 @@ import org.sadtech.bot.vsc.bitbucketbot.context.exception.RegException;
 import org.sadtech.bot.vsc.bitbucketbot.context.repository.PersonRepository;
 import org.sadtech.bot.vsc.bitbucketbot.context.service.NotifyService;
 import org.sadtech.bot.vsc.bitbucketbot.context.service.PersonService;
+import org.sadtech.haiti.core.util.Assert;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/PullRequestsServiceImpl.java

@@ -1,13 +1,6 @@
 package org.sadtech.bot.vcs.core.service.impl;
 
 import lombok.NonNull;
-import org.sadtech.basic.context.page.Pagination;
-import org.sadtech.basic.context.page.Sheet;
-import org.sadtech.basic.context.service.simple.FilterService;
-import org.sadtech.basic.core.service.AbstractSimpleManagerService;
-import org.sadtech.basic.core.util.Assert;
-import org.sadtech.basic.filter.criteria.CriteriaFilter;
-import org.sadtech.basic.filter.criteria.CriteriaQuery;
 import org.sadtech.bot.vcs.core.config.properties.RatingProperty;
 import org.sadtech.bot.vsc.bitbucketbot.context.domain.IdAndStatusPr;
 import org.sadtech.bot.vsc.bitbucketbot.context.domain.PointType;
@@ -31,6 +24,13 @@ import org.sadtech.bot.vsc.bitbucketbot.context.service.PullRequestsService;
 import org.sadtech.bot.vsc.bitbucketbot.context.service.RatingService;
 import org.sadtech.bot.vsc.context.domain.PullRequestStatus;
 import org.sadtech.bot.vsc.context.domain.ReviewerStatus;
+import org.sadtech.haiti.context.page.Pagination;
+import org.sadtech.haiti.context.page.Sheet;
+import org.sadtech.haiti.context.service.simple.FilterService;
+import org.sadtech.haiti.core.service.AbstractSimpleManagerService;
+import org.sadtech.haiti.core.util.Assert;
+import org.sadtech.haiti.filter.criteria.CriteriaFilter;
+import org.sadtech.haiti.filter.criteria.CriteriaQuery;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/TaskServiceImpl.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.TaskStatus;
@@ -20,6 +18,8 @@ import org.sadtech.bot.vsc.bitbucketbot.context.service.NotifyService;
 import org.sadtech.bot.vsc.bitbucketbot.context.service.PullRequestsService;
 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.core.convert.ConversionService;
 import org.springframework.stereotype.Service;
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/filter/PullRequestFilterService.java

@@ -1,15 +1,15 @@
 package org.sadtech.bot.vcs.core.service.impl.filter;
 
 import lombok.NonNull;
-import org.sadtech.basic.core.service.AbstractFilterService;
-import org.sadtech.basic.filter.Filter;
-import org.sadtech.basic.filter.FilterQuery;
-import org.sadtech.basic.filter.criteria.CriteriaFilter;
-import org.sadtech.basic.filter.criteria.CriteriaQuery;
 import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequest;
 import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequest_;
 import org.sadtech.bot.vsc.bitbucketbot.context.domain.filter.PullRequestFilter;
 import org.sadtech.bot.vsc.bitbucketbot.context.repository.PullRequestsRepository;
+import org.sadtech.haiti.core.service.AbstractFilterService;
+import org.sadtech.haiti.filter.Filter;
+import org.sadtech.haiti.filter.FilterQuery;
+import org.sadtech.haiti.filter.criteria.CriteriaFilter;
+import org.sadtech.haiti.filter.criteria.CriteriaQuery;
 import org.springframework.stereotype.Service;
 
 @Service

pom.xml

@@ -39,9 +39,12 @@
         <org.sadtech.bot.rest.version>3.0.0-RELEASE</org.sadtech.bot.rest.version>
         <org.sadtech.bot.telegram.version>3.0.0-RELEASE</org.sadtech.bot.telegram.version>
 
+        <org.sadtech.haiti.context.version>0.0.1-SNAPSHOT</org.sadtech.haiti.context.version>
+        <org.sadtech.haiti.filter.version>0.0.1-SNAPSHOT</org.sadtech.haiti.filter.version>
         <org.sadtech.telegram.bot-core.version>0.0.1-DEVELOPER</org.sadtech.telegram.bot-core.version>
+        <org.sadtech.bot.vsc.context.version>0.0.1-DEVELOP</org.sadtech.bot.vsc.context.version>
 
-        <sadtech.project.database.version>0.1.0-SNAPSHOT</sadtech.project.database.version>
+        <org.sadtech.haiti.database.version>0.0.1-SNAPSHOT</org.sadtech.haiti.database.version>
         <sadtech.project.filter.criteria.version>0.1.0-SNAPSHOT</sadtech.project.filter.criteria.version>
 
         <javax.persistance.version>2.2</javax.persistance.version>
@@ -102,9 +105,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.sadtech.basic</groupId>
+                <groupId>org.sadtech.haiti</groupId>
-                <artifactId>project-database</artifactId>
+                <artifactId>haiti-database</artifactId>
-                <version>${sadtech.project.database.version}</version>
+                <version>${org.sadtech.haiti.database.version}</version>
             </dependency>
 
             <dependency>
@@ -113,6 +116,24 @@
                 <version>${org.sadtech.telegram.bot-core.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.sadtech.haiti</groupId>
+                <artifactId>haiti-context</artifactId>
+                <version>${org.sadtech.haiti.context.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.sadtech.bot.vcs</groupId>
+                <artifactId>vcs-bot-context</artifactId>
+                <version>${org.sadtech.bot.vsc.context.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.sadtech.haiti.filter</groupId>
+                <artifactId>criteria-filter</artifactId>
+                <version>${org.sadtech.haiti.filter.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.hibernate.orm</groupId>
                 <artifactId>hibernate-jpamodelgen</artifactId>

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;
 

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;

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;
 

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;

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;

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;

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;
 

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;

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;
 

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;

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;

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;

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;