Предварительная версия

bitbucket-app/pom.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>bitbucketbot</artifactId>
+        <groupId>org.sadtech.bot.bitbucketbot</groupId>
+        <version>2.1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>bitbucket-app</artifactId>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.sadtech.bot.bitbucketbot</groupId>
+            <artifactId>bot-core</artifactId>
+            <version>2.1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.sadtech.bot.bitbucketbot</groupId>
+            <artifactId>bot-rest</artifactId>
+            <version>2.1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.sadtech.bot.bitbucketbot</groupId>
+            <artifactId>telegram-bot</artifactId>
+            <version>2.1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.sadtech.bot.bitbucketbot</groupId>
+            <artifactId>bitbucket-sdk</artifactId>
+            <version>2.1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/BitbucketbotApplication.java

@@ -0,0 +1,17 @@
+package org.sadtech.bot.vcs.bitbucket;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+
+@EnableJpaRepositories(basePackages = "org.sadtech.bot.vcs.core.repository.jpa")
+@SpringBootApplication(scanBasePackages = "org.sadtech.bot.vcs")
+@EntityScan(basePackages = "org.sadtech.bot.vcs.core.domain.entity")
+public class BitbucketbotApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(BitbucketbotApplication.class, args);
+    }
+
+}

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/config/AppConfig.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.config;
+package org.sadtech.bot.vcs.bitbucket.app.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/exception/BitbucketAppException.java

@@ -0,0 +1,14 @@
+package org.sadtech.bot.vcs.bitbucket.exception;
+
+/**
+ * // TODO: 16.09.2020 Добавить описание.
+ *
+ * @author upagge 16.09.2020
+ */
+public class BitbucketAppException extends RuntimeException {
+
+    public BitbucketAppException(String message) {
+        super(message);
+    }
+
+}

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/exception/ConvertException.java

@@ -0,0 +1,14 @@
+package org.sadtech.bot.vcs.bitbucket.exception;
+
+/**
+ * // TODO: 16.09.2020 Добавить описание.
+ *
+ * @author upagge 16.09.2020
+ */
+public class ConvertException extends BitbucketAppException {
+
+    public ConvertException(String message) {
+        super(message);
+    }
+
+}

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/scheduler/CommentAndTaskScheduler.java

@@ -1,7 +1,7 @@
-package org.sadtech.bot.bitbucketbot.scheduler.parser;
+package org.sadtech.bot.vcs.bitbucket.scheduler;
 
 import lombok.RequiredArgsConstructor;
-import org.sadtech.bot.bitbucketbot.service.parser.CommentAndTaskParser;
+import org.sadtech.bot.vcs.bitbucket.service.CommentAndTaskParser;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/scheduler/PersonScheduler.java

@@ -1,7 +1,7 @@
-package org.sadtech.bot.bitbucketbot.scheduler.parser;
+package org.sadtech.bot.vcs.bitbucket.scheduler;
 
 import lombok.RequiredArgsConstructor;
-import org.sadtech.bot.bitbucketbot.service.impl.parser.PersonBitbucketParser;
+import org.sadtech.bot.vcs.bitbucket.service.parser.PersonBitbucketParser;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/scheduler/PullRequestParserScheduler.java

@@ -1,8 +1,8 @@
-package org.sadtech.bot.bitbucketbot.scheduler.parser;
+package org.sadtech.bot.vcs.bitbucket.scheduler;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.sadtech.bot.bitbucketbot.service.parser.PullRequestParser;
+import org.sadtech.bot.vcs.core.service.parser.PullRequestParser;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/CommentAndTaskParser.java

@@ -1,25 +1,24 @@
-package org.sadtech.bot.bitbucketbot.service.parser;
+package org.sadtech.bot.vcs.bitbucket.service;
 
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.sadtech.basic.context.page.Sheet;
 import org.sadtech.basic.core.page.PaginationImpl;
-import org.sadtech.bot.bitbucketbot.config.InitProperty;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson;
-import org.sadtech.bot.bitbucketbot.config.properties.BitbucketProperty;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.Severity;
-import org.sadtech.bot.bitbucketbot.config.properties.CommentSchedulerProperty;
+import org.sadtech.bot.vcs.bitbucket.service.executor.DataScan;
-import org.sadtech.bot.bitbucketbot.domain.entity.Comment;
+import org.sadtech.bot.vcs.core.config.properties.BitbucketProperty;
-import org.sadtech.bot.bitbucketbot.domain.entity.PullRequest;
+import org.sadtech.bot.vcs.core.config.properties.CommentSchedulerProperty;
-import org.sadtech.bot.bitbucketbot.domain.entity.PullRequestMini;
+import org.sadtech.bot.vcs.core.config.properties.InitProperty;
-import org.sadtech.bot.bitbucketbot.domain.entity.Task;
+import org.sadtech.bot.vcs.core.domain.entity.Comment;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentJson;
+import org.sadtech.bot.vcs.core.domain.entity.PullRequest;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.Severity;
+import org.sadtech.bot.vcs.core.domain.entity.PullRequestMini;
-import org.sadtech.bot.bitbucketbot.exception.NotFoundException;
+import org.sadtech.bot.vcs.core.domain.entity.Task;
-import org.sadtech.bot.bitbucketbot.service.CommentService;
+import org.sadtech.bot.vcs.core.exception.NotFoundException;
-import org.sadtech.bot.bitbucketbot.service.PullRequestsService;
+import org.sadtech.bot.vcs.core.service.CommentService;
-import org.sadtech.bot.bitbucketbot.service.TaskService;
+import org.sadtech.bot.vcs.core.service.PullRequestsService;
-import org.sadtech.bot.bitbucketbot.service.Utils;
+import org.sadtech.bot.vcs.core.service.TaskService;
-import org.sadtech.bot.bitbucketbot.service.executor.DataScan;
+import org.sadtech.bot.vcs.core.service.Utils;
-import org.sadtech.bot.bitbucketbot.service.impl.ExecutorScanner;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.stereotype.Component;
 

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/ExecutorScanner.java

@@ -1,13 +1,13 @@
-package org.sadtech.bot.bitbucketbot.service.impl;
+package org.sadtech.bot.vcs.bitbucket.service;
 
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.sadtech.bot.bitbucketbot.config.properties.BitbucketProperty;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentJson;
+import org.sadtech.bot.vcs.bitbucket.service.executor.DataScan;
-import org.sadtech.bot.bitbucketbot.service.executor.DataScan;
+import org.sadtech.bot.vcs.bitbucket.service.executor.Executor;
-import org.sadtech.bot.bitbucketbot.service.executor.Executor;
+import org.sadtech.bot.vcs.bitbucket.service.executor.Seeker;
-import org.sadtech.bot.bitbucketbot.service.executor.Seeker;
+import org.sadtech.bot.vcs.core.config.properties.BitbucketProperty;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/converter/CommentJsonToComment.java

@@ -1,8 +1,9 @@
-package org.sadtech.bot.bitbucketbot.service.converter;
+package org.sadtech.bot.vcs.bitbucket.service.converter;
 
-import org.sadtech.bot.bitbucketbot.domain.entity.Comment;
+
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentJson;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.Severity;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.Severity;
+import org.sadtech.bot.vcs.core.domain.entity.Comment;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.stereotype.Component;
 

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/converter/CommentJsonToTaskConvert.java

@@ -1,11 +1,11 @@
-package org.sadtech.bot.bitbucketbot.service.converter;
+package org.sadtech.bot.vcs.bitbucket.service.converter;
 
-import org.sadtech.basic.context.exception.ConvertException;
+import org.sadtech.bot.vcs.bitbucket.exception.ConvertException;
-import org.sadtech.bot.bitbucketbot.domain.TaskStatus;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson;
-import org.sadtech.bot.bitbucketbot.domain.entity.Task;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentState;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentJson;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.Severity;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentState;
+import org.sadtech.bot.vcs.core.domain.TaskStatus;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.Severity;
+import org.sadtech.bot.vcs.core.domain.entity.Task;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.stereotype.Component;
 

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/converter/PullRequestJsonConverter.java

@@ -1,16 +1,17 @@
-package org.sadtech.bot.bitbucketbot.service.converter;
+package org.sadtech.bot.vcs.bitbucket.service.converter;
 
 import lombok.RequiredArgsConstructor;
-import org.sadtech.bot.bitbucketbot.domain.PullRequestStatus;
+import org.sadtech.bot.vcs.bitbucket.exception.ConvertException;
-import org.sadtech.bot.bitbucketbot.domain.ReviewerStatus;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.Outcome;
-import org.sadtech.bot.bitbucketbot.domain.entity.PullRequest;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.Properties;
-import org.sadtech.bot.bitbucketbot.domain.entity.Reviewer;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.PullRequestJson;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.Outcome;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.PullRequestState;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.Properties;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.UserDecisionJson;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.PullRequestJson;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.UserPullRequestStatus;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.PullRequestState;
+import org.sadtech.bot.vcs.core.domain.PullRequestStatus;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.UserDecisionJson;
+import org.sadtech.bot.vcs.core.domain.ReviewerStatus;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.UserPullRequestStatus;
+import org.sadtech.bot.vcs.core.domain.entity.PullRequest;
+import org.sadtech.bot.vcs.core.domain.entity.Reviewer;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.stereotype.Component;
 
@@ -64,8 +65,9 @@ public class PullRequestJsonConverter implements Converter<PullRequestJson, Pull
                 return PullRequestStatus.MERGED;
             case DECLINED:
                 return PullRequestStatus.DECLINED;
+            default:
+                throw new ConvertException("Неподдерживаемый тип ПР");
         }
-        return null;
     }
 
     private List<Reviewer> convertReviewers(List<UserDecisionJson> jsonReviewers) {
@@ -89,8 +91,9 @@ public class PullRequestJsonConverter implements Converter<PullRequestJson, Pull
                 return ReviewerStatus.UNAPPROVED;
             case UNAPPROVED:
                 return ReviewerStatus.NEEDS_WORK;
+            default:
+                throw new ConvertException("Неподдерживаемый статус ревьювера");
         }
-        return null;
     }
 
 }

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/converter/UserJsonConverter.java

@@ -1,7 +1,7 @@
-package org.sadtech.bot.bitbucketbot.service.converter;
+package org.sadtech.bot.vcs.bitbucket.service.converter;
 
-import org.sadtech.bot.bitbucketbot.domain.entity.Person;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.UserJson;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.UserJson;
+import org.sadtech.bot.vcs.core.domain.entity.Person;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.stereotype.Component;
 

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/executor/DataScan.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.service.executor;
+package org.sadtech.bot.vcs.bitbucket.service.executor;
 
 import lombok.Data;
 

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/executor/Executor.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.service.executor;
+package org.sadtech.bot.vcs.bitbucket.service.executor;
 
 import lombok.NonNull;
 
@@ -9,4 +9,5 @@ public interface Executor<T, D> {
     boolean registration(@NonNull List<T> seeker);
 
     List<D> getResult();
+
 }

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/executor/ResultScan.java

@@ -1,8 +1,8 @@
-package org.sadtech.bot.bitbucketbot.service.executor;
+package org.sadtech.bot.vcs.bitbucket.service.executor;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentJson;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson;
 
 @Getter
 @RequiredArgsConstructor

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/executor/Seeker.java

@@ -1,8 +1,8 @@
-package org.sadtech.bot.bitbucketbot.service.executor;
+package org.sadtech.bot.vcs.bitbucket.service.executor;
 
 import lombok.RequiredArgsConstructor;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentJson;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson;
-import org.sadtech.bot.bitbucketbot.service.Utils;
+import org.sadtech.bot.vcs.core.service.Utils;
 
 import java.util.Optional;
 import java.util.concurrent.Callable;

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/parser/PersonBitbucketParser.java

@@ -1,13 +1,13 @@
-package org.sadtech.bot.bitbucketbot.service.impl.parser;
+package org.sadtech.bot.vcs.bitbucket.service.parser;
 
 import lombok.RequiredArgsConstructor;
-import org.sadtech.bot.bitbucketbot.config.properties.BitbucketProperty;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.UserJson;
-import org.sadtech.bot.bitbucketbot.domain.entity.Person;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.sheet.UserSheetJson;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.UserJson;
+import org.sadtech.bot.vcs.core.config.properties.BitbucketProperty;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.sheet.UserSheetJson;
+import org.sadtech.bot.vcs.core.domain.entity.Person;
-import org.sadtech.bot.bitbucketbot.service.PersonService;
+import org.sadtech.bot.vcs.core.service.PersonService;
-import org.sadtech.bot.bitbucketbot.service.Utils;
+import org.sadtech.bot.vcs.core.service.Utils;
-import org.sadtech.bot.bitbucketbot.service.parser.PersonParser;
+import org.sadtech.bot.vcs.core.service.parser.PersonParser;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.stereotype.Service;
 

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/parser/PullRequestBitbucketParser.java

@@ -1,21 +1,21 @@
-package org.sadtech.bot.bitbucketbot.service.impl.parser;
+package org.sadtech.bot.vcs.bitbucket.service.parser;
 
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.sadtech.bot.bitbucketbot.config.properties.BitbucketProperty;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.PullRequestJson;
-import org.sadtech.bot.bitbucketbot.domain.IdAndStatusPr;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.sheet.PullRequestSheetJson;
-import org.sadtech.bot.bitbucketbot.domain.PullRequestStatus;
+import org.sadtech.bot.vcs.core.config.properties.BitbucketProperty;
-import org.sadtech.bot.bitbucketbot.domain.entity.Person;
+import org.sadtech.bot.vcs.core.domain.IdAndStatusPr;
-import org.sadtech.bot.bitbucketbot.domain.entity.PullRequest;
+import org.sadtech.bot.vcs.core.domain.PullRequestStatus;
-import org.sadtech.bot.bitbucketbot.domain.filter.PullRequestFilter;
+import org.sadtech.bot.vcs.core.domain.entity.Person;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.PullRequestJson;
+import org.sadtech.bot.vcs.core.domain.entity.PullRequest;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.sheet.PullRequestSheetJson;
+import org.sadtech.bot.vcs.core.domain.filter.PullRequestFilter;
-import org.sadtech.bot.bitbucketbot.service.PersonService;
+import org.sadtech.bot.vcs.core.service.PersonService;
-import org.sadtech.bot.bitbucketbot.service.PullRequestsService;
+import org.sadtech.bot.vcs.core.service.PullRequestsService;
-import org.sadtech.bot.bitbucketbot.service.Utils;
+import org.sadtech.bot.vcs.core.service.Utils;
-import org.sadtech.bot.bitbucketbot.service.parser.PullRequestParser;
+import org.sadtech.bot.vcs.core.service.parser.PullRequestParser;
-import org.sadtech.bot.bitbucketbot.utils.Pair;
+import org.sadtech.bot.vcs.core.utils.Pair;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.stereotype.Service;
 
@@ -27,16 +27,12 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.sadtech.bot.bitbucketbot.domain.PullRequestStatus.DECLINED;
-import static org.sadtech.bot.bitbucketbot.domain.PullRequestStatus.MERGED;
-import static org.sadtech.bot.bitbucketbot.domain.PullRequestStatus.OPEN;
-
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class PullRequestBitbucketParser implements PullRequestParser {
 
-    private static final Set<PullRequestStatus> OLD_STATUSES = Stream.of(MERGED, OPEN, DECLINED).collect(Collectors.toSet());
+    private static final Set<PullRequestStatus> OLD_STATUSES = Stream.of(PullRequestStatus.MERGED, PullRequestStatus.OPEN, PullRequestStatus.DECLINED).collect(Collectors.toSet());
 
     private final PullRequestsService pullRequestsService;
     private final PersonService personService;

bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/utils/Converter.java

@@ -1,10 +1,10 @@
-package org.sadtech.bot.bitbucketbot.utils;
+package org.sadtech.bot.vcs.bitbucket.utils;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.sadtech.bot.bitbucketbot.domain.TaskStatus;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentState;
-import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentState;
+import org.sadtech.bot.vcs.core.domain.TaskStatus;
-import org.sadtech.bot.bitbucketbot.exception.NotFoundException;
+import org.sadtech.bot.vcs.core.exception.NotFoundException;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class Converter {

bitbucket-app/src/main/resources/application.yaml

@@ -0,0 +1,5 @@
+server:
+  port: 8018
+telegram-config:
+  bot-username: tsc_test_two_bot
+  bot-token: 1304335862:AAFXGxRkTZBiL9Gjce_oFoP2cOn7j8qEwDI

bitbucket-app/src/main/resources/logback.xml

@@ -18,7 +18,7 @@
     </appender>
 
     <root level="info">
-        <appender-ref ref="FILE"/>
+        <appender-ref ref="STDOUT"/>
     </root>
 
 </configuration>

bitbucket-sdk/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>bitbucketbot</artifactId>
+        <groupId>org.sadtech.bot.bitbucketbot</groupId>
+        <version>2.1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>bitbucket-sdk</artifactId>
+    <version>2.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/BitbucketUserRole.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.domain;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 /**
  * TODO: Добавить комментарий енума.

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/CommentJson.java

@@ -1,8 +1,8 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.Data;
-import org.sadtech.bot.bitbucketbot.utils.LocalDateTimeFromEpochDeserializer;
+import org.sadtech.bot.vcs.bitbucket.sdk.utils.LocalDateTimeFromEpochDeserializer;
 
 import java.time.LocalDateTime;
 import java.util.List;

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/CommentState.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 public enum CommentState {
 

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/FromRefJson.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 import lombok.Data;
 

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/LinkJson.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 import lombok.Data;
 

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/MergeResult.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 import lombok.Data;
 

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Outcome.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 public enum Outcome {
 

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/ProjectJson.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 import lombok.Data;
 

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Properties.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 import lombok.Data;
 

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/PullRequestJson.java

@@ -1,8 +1,8 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.Data;
-import org.sadtech.bot.bitbucketbot.utils.LocalDateTimeFromEpochDeserializer;
+import org.sadtech.bot.vcs.bitbucket.sdk.utils.LocalDateTimeFromEpochDeserializer;
 
 import java.time.LocalDateTime;
 import java.util.List;

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/PullRequestState.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 /**
  * TODO: Добавить комментарий енума.

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/RepositoryJson.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 import lombok.Data;
 

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/SelfJson.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 import lombok.Data;
 

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Severity.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 public enum Severity {
 

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Sheet.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 import lombok.Data;
 

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/UserDecisionJson.java

@@ -1,7 +1,6 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 import lombok.Data;
-import org.sadtech.bot.bitbucketbot.domain.BitbucketUserRole;
 
 /**
  * TODO: Добавить описание класса.

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/UserJson.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 import lombok.Data;
 

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/UserPullRequestStatus.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.dto.bitbucket;
+package org.sadtech.bot.vcs.bitbucket.sdk.domain;
 
 /**
  * TODO: Добавить комментарий енума.

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/sheet/PullRequestSheetJson.java

@@ -0,0 +1,13 @@
+package org.sadtech.bot.vcs.bitbucket.sdk.domain.sheet;
+
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.PullRequestJson;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.Sheet;
+
+/**
+ * TODO: Добавить описание класса.
+ *
+ * @author upagge [02.02.2020]
+ */
+public class PullRequestSheetJson extends Sheet<PullRequestJson> {
+
+}

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/sheet/UserSheetJson.java

@@ -0,0 +1,13 @@
+package org.sadtech.bot.vcs.bitbucket.sdk.domain.sheet;
+
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.Sheet;
+import org.sadtech.bot.vcs.bitbucket.sdk.domain.UserJson;
+
+/**
+ * TODO: Добавить описание класса.
+ *
+ * @author upagge [02.02.2020]
+ */
+public class UserSheetJson extends Sheet<UserJson> {
+
+}

bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/utils/LocalDateTimeFromEpochDeserializer.java

@@ -1,16 +1,14 @@
-package org.sadtech.bot.bitbucketbot.utils;
+package org.sadtech.bot.vcs.bitbucket.sdk.utils;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
-import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 
-@Slf4j
 public class LocalDateTimeFromEpochDeserializer extends JsonDeserializer<LocalDateTime> {
 
     @Override
@@ -20,7 +18,7 @@ public class LocalDateTimeFromEpochDeserializer extends JsonDeserializer<LocalDa
             Instant instant = Instant.ofEpochMilli(time);
             return instant.atZone(ZoneId.systemDefault()).toLocalDateTime();
         } catch (IOException e) {
-            log.error(e.getMessage());
+
         }
         return null;
     }

bot-core/pom.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>bitbucketbot</artifactId>
+        <groupId>org.sadtech.bot.bitbucketbot</groupId>
+        <version>2.1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>bot-core</artifactId>
+    <version>2.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.sadtech.basic.filter</groupId>
+            <artifactId>criteria-filter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.sadtech.basic</groupId>
+            <artifactId>project-database</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-jpamodelgen</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>

bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/BitbucketProperty.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.config.properties;
+package org.sadtech.bot.vcs.core.config.properties;
 
 import lombok.Getter;
 import lombok.Setter;

bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/CommentSchedulerProperty.java

@@ -1,8 +1,8 @@
-package org.sadtech.bot.bitbucketbot.config.properties;
+package org.sadtech.bot.vcs.core.config.properties;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.sadtech.bot.bitbucketbot.scheduler.SchedulerComments;
+import org.sadtech.bot.vcs.core.scheduler.SchedulerComments;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/InitProperty.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.config;
+package org.sadtech.bot.vcs.core.config.properties;
 
 import lombok.Getter;
 import lombok.Setter;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/Answer.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.domain;
+package org.sadtech.bot.vcs.core.domain;
 
 import lombok.AccessLevel;
 import lombok.Getter;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/AuthType.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.domain;
+package org.sadtech.bot.vcs.core.domain;
 
 /**
  * TODO: Добавить комментарий енума.

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/IdAndStatusPr.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.domain;
+package org.sadtech.bot.vcs.core.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/MessageSend.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.domain;
+package org.sadtech.bot.vcs.core.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/PullRequestStatus.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.domain;
+package org.sadtech.bot.vcs.core.domain;
 
 /**
  * @author upagge [31.01.2020]

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/ReviewerStatus.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.domain;
+package org.sadtech.bot.vcs.core.domain;
 
 import lombok.Getter;
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/TaskStatus.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.domain;
+package org.sadtech.bot.vcs.core.domain;
 
 public enum TaskStatus {
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/UserAuth.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.domain;
+package org.sadtech.bot.vcs.core.domain;
 
 /**
  * TODO: Добавить описание класса.

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/Change.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.domain.change;
+package org.sadtech.bot.vcs.core.domain.change;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/ChangeType.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.domain.change;
+package org.sadtech.bot.vcs.core.domain.change;
 
 public enum ChangeType {
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/comment/AnswerCommentChange.java

@@ -1,12 +1,12 @@
-package org.sadtech.bot.bitbucketbot.domain.change.comment;
+package org.sadtech.bot.vcs.core.domain.change.comment;
 
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.sadtech.bot.bitbucketbot.domain.Answer;
+import org.sadtech.bot.vcs.core.domain.Answer;
-import org.sadtech.bot.bitbucketbot.domain.change.Change;
+import org.sadtech.bot.vcs.core.domain.change.Change;
-import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
+import org.sadtech.bot.vcs.core.domain.change.ChangeType;
-import org.sadtech.bot.bitbucketbot.utils.Smile;
+import org.sadtech.bot.vcs.core.utils.Smile;
 
 import java.text.MessageFormat;
 import java.util.List;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/comment/CommentChange.java

@@ -1,11 +1,11 @@
-package org.sadtech.bot.bitbucketbot.domain.change.comment;
+package org.sadtech.bot.vcs.core.domain.change.comment;
 
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.sadtech.bot.bitbucketbot.domain.change.Change;
+import org.sadtech.bot.vcs.core.domain.change.Change;
-import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
+import org.sadtech.bot.vcs.core.domain.change.ChangeType;
-import org.sadtech.bot.bitbucketbot.utils.Smile;
+import org.sadtech.bot.vcs.core.utils.Smile;
 
 import java.text.MessageFormat;
 import java.util.Set;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/pullrequest/ConflictPrChange.java

@@ -1,9 +1,9 @@
-package org.sadtech.bot.bitbucketbot.domain.change.pullrequest;
+package org.sadtech.bot.vcs.core.domain.change.pullrequest;
 
 import lombok.Builder;
 import lombok.Getter;
-import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
+import org.sadtech.bot.vcs.core.domain.change.ChangeType;
-import org.sadtech.bot.bitbucketbot.utils.Smile;
+import org.sadtech.bot.vcs.core.utils.Smile;
 
 import java.text.MessageFormat;
 import java.util.Set;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/pullrequest/NewPrChange.java

@@ -1,10 +1,10 @@
-package org.sadtech.bot.bitbucketbot.domain.change.pullrequest;
+package org.sadtech.bot.vcs.core.domain.change.pullrequest;
 
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
+import org.sadtech.bot.vcs.core.domain.change.ChangeType;
-import org.sadtech.bot.bitbucketbot.utils.Smile;
+import org.sadtech.bot.vcs.core.utils.Smile;
 
 import java.text.MessageFormat;
 import java.util.Set;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/pullrequest/PrChange.java

@@ -1,9 +1,9 @@
-package org.sadtech.bot.bitbucketbot.domain.change.pullrequest;
+package org.sadtech.bot.vcs.core.domain.change.pullrequest;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.sadtech.bot.bitbucketbot.domain.change.Change;
+import org.sadtech.bot.vcs.core.domain.change.Change;
-import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
+import org.sadtech.bot.vcs.core.domain.change.ChangeType;
 
 import java.util.Set;
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/pullrequest/ReviewersPrChange.java

@@ -1,20 +1,20 @@
-package org.sadtech.bot.bitbucketbot.domain.change.pullrequest;
+package org.sadtech.bot.vcs.core.domain.change.pullrequest;
 
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
+import org.sadtech.bot.vcs.core.domain.change.ChangeType;
-import org.sadtech.bot.bitbucketbot.domain.util.ReviewerChange;
+import org.sadtech.bot.vcs.core.domain.util.ReviewerChange;
-import org.sadtech.bot.bitbucketbot.utils.Smile;
+import org.sadtech.bot.vcs.core.utils.Smile;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.sadtech.bot.bitbucketbot.domain.util.ReviewerChange.Type.DELETED;
+import static org.sadtech.bot.vcs.core.domain.util.ReviewerChange.Type.DELETED;
-import static org.sadtech.bot.bitbucketbot.domain.util.ReviewerChange.Type.NEW;
+import static org.sadtech.bot.vcs.core.domain.util.ReviewerChange.Type.NEW;
-import static org.sadtech.bot.bitbucketbot.domain.util.ReviewerChange.Type.OLD;
+import static org.sadtech.bot.vcs.core.domain.util.ReviewerChange.Type.OLD;
 
 @Getter
 @EqualsAndHashCode(callSuper = true)

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/pullrequest/StatusPrChange.java

@@ -1,11 +1,11 @@
-package org.sadtech.bot.bitbucketbot.domain.change.pullrequest;
+package org.sadtech.bot.vcs.core.domain.change.pullrequest;
 
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.sadtech.bot.bitbucketbot.domain.PullRequestStatus;
+import org.sadtech.bot.vcs.core.domain.PullRequestStatus;
-import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
+import org.sadtech.bot.vcs.core.domain.change.ChangeType;
-import org.sadtech.bot.bitbucketbot.utils.Smile;
+import org.sadtech.bot.vcs.core.utils.Smile;
 
 import java.text.MessageFormat;
 import java.util.Set;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/pullrequest/UpdatePrChange.java

@@ -1,10 +1,10 @@
-package org.sadtech.bot.bitbucketbot.domain.change.pullrequest;
+package org.sadtech.bot.vcs.core.domain.change.pullrequest;
 
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
+import org.sadtech.bot.vcs.core.domain.change.ChangeType;
-import org.sadtech.bot.bitbucketbot.utils.Smile;
+import org.sadtech.bot.vcs.core.utils.Smile;
 
 import java.text.MessageFormat;
 import java.util.Set;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/task/TaskChange.java

@@ -1,9 +1,9 @@
-package org.sadtech.bot.bitbucketbot.domain.change.task;
+package org.sadtech.bot.vcs.core.domain.change.task;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.sadtech.bot.bitbucketbot.domain.change.Change;
+import org.sadtech.bot.vcs.core.domain.change.Change;
-import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
+import org.sadtech.bot.vcs.core.domain.change.ChangeType;
 
 import java.util.Set;
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/task/TaskCloseChange.java

@@ -1,8 +1,8 @@
-package org.sadtech.bot.bitbucketbot.domain.change.task;
+package org.sadtech.bot.vcs.core.domain.change.task;
 
 import lombok.Builder;
-import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
+import org.sadtech.bot.vcs.core.domain.change.ChangeType;
-import org.sadtech.bot.bitbucketbot.utils.Smile;
+import org.sadtech.bot.vcs.core.utils.Smile;
 
 import java.text.MessageFormat;
 import java.util.Set;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/task/TaskNewChange.java

@@ -1,9 +1,9 @@
-package org.sadtech.bot.bitbucketbot.domain.change.task;
+package org.sadtech.bot.vcs.core.domain.change.task;
 
 import lombok.Builder;
 import lombok.Getter;
-import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
+import org.sadtech.bot.vcs.core.domain.change.ChangeType;
-import org.sadtech.bot.bitbucketbot.utils.Smile;
+import org.sadtech.bot.vcs.core.utils.Smile;
 
 import java.text.MessageFormat;
 import java.util.Set;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/entity/Comment.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.domain.entity;
+package org.sadtech.bot.vcs.core.domain.entity;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/entity/Person.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.domain.entity;
+package org.sadtech.bot.vcs.core.domain.entity;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/entity/PullRequest.java

@@ -1,9 +1,9 @@
-package org.sadtech.bot.bitbucketbot.domain.entity;
+package org.sadtech.bot.vcs.core.domain.entity;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
-import org.sadtech.bot.bitbucketbot.domain.PullRequestStatus;
+import org.sadtech.bot.vcs.core.domain.PullRequestStatus;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/entity/PullRequestMini.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.domain.entity;
+package org.sadtech.bot.vcs.core.domain.entity;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/entity/Reviewer.java

@@ -1,9 +1,9 @@
-package org.sadtech.bot.bitbucketbot.domain.entity;
+package org.sadtech.bot.vcs.core.domain.entity;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
-import org.sadtech.bot.bitbucketbot.domain.ReviewerStatus;
+import org.sadtech.bot.vcs.core.domain.ReviewerStatus;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/entity/Task.java

@@ -1,9 +1,9 @@
-package org.sadtech.bot.bitbucketbot.domain.entity;
+package org.sadtech.bot.vcs.core.domain.entity;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
-import org.sadtech.bot.bitbucketbot.domain.TaskStatus;
+import org.sadtech.bot.vcs.core.domain.TaskStatus;
 
 import javax.persistence.CollectionTable;
 import javax.persistence.Column;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/filter/PullRequestFilter.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.domain.filter;
+package org.sadtech.bot.vcs.core.domain.filter;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/util/ReviewerChange.java

@@ -1,8 +1,8 @@
-package org.sadtech.bot.bitbucketbot.domain.util;
+package org.sadtech.bot.vcs.core.domain.util;
 
 import lombok.Getter;
 import lombok.NonNull;
-import org.sadtech.bot.bitbucketbot.domain.ReviewerStatus;
+import org.sadtech.bot.vcs.core.domain.ReviewerStatus;
 
 /**
  * TODO: Добавить описание класса.

bot-core/src/main/java/org/sadtech/bot/vcs/core/exception/BitbucketBotException.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.exception;
+package org.sadtech.bot.vcs.core.exception;
 
 abstract class BitbucketBotException extends RuntimeException {
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/exception/CreateException.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.exception;
+package org.sadtech.bot.vcs.core.exception;
 
 public class CreateException extends BitbucketBotException {
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/exception/NotFoundException.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.exception;
+package org.sadtech.bot.vcs.core.exception;
 
 public class NotFoundException extends BitbucketBotException {
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/exception/RegException.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.exception;
+package org.sadtech.bot.vcs.core.exception;
 
 public class RegException extends BitbucketBotException {
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/exception/UpdateException.java

@@ -1,4 +1,4 @@
-package org.sadtech.bot.bitbucketbot.exception;
+package org.sadtech.bot.vcs.core.exception;
 
 public class UpdateException extends BitbucketBotException {
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/ChangeRepository.java

@@ -1,7 +1,7 @@
-package org.sadtech.bot.bitbucketbot.repository;
+package org.sadtech.bot.vcs.core.repository;
 
 import lombok.NonNull;
-import org.sadtech.bot.bitbucketbot.domain.change.Change;
+import org.sadtech.bot.vcs.core.domain.change.Change;
 
 import java.util.List;
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/CommentRepository.java

@@ -1,8 +1,8 @@
-package org.sadtech.bot.bitbucketbot.repository;
+package org.sadtech.bot.vcs.core.repository;
 
 import lombok.NonNull;
 import org.sadtech.basic.context.repository.SimpleManagerRepository;
-import org.sadtech.bot.bitbucketbot.domain.entity.Comment;
+import org.sadtech.bot.vcs.core.domain.entity.Comment;
 
 import java.time.LocalDateTime;
 import java.util.List;

bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/PersonRepository.java

@@ -1,7 +1,7 @@
-package org.sadtech.bot.bitbucketbot.repository;
+package org.sadtech.bot.vcs.core.repository;
 
 import lombok.NonNull;
-import org.sadtech.bot.bitbucketbot.domain.entity.Person;
+import org.sadtech.bot.vcs.core.domain.entity.Person;
 
 import java.util.List;
 import java.util.Optional;

bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/PullRequestsRepository.java

@@ -1,13 +1,13 @@
-package org.sadtech.bot.bitbucketbot.repository;
+package org.sadtech.bot.vcs.core.repository;
 
 import lombok.NonNull;
 import org.sadtech.basic.context.repository.SimpleManagerRepository;
 import org.sadtech.basic.context.repository.simple.FilterOperation;
-import org.sadtech.bot.bitbucketbot.domain.IdAndStatusPr;
+import org.sadtech.bot.vcs.core.domain.IdAndStatusPr;
-import org.sadtech.bot.bitbucketbot.domain.PullRequestStatus;
+import org.sadtech.bot.vcs.core.domain.PullRequestStatus;
-import org.sadtech.bot.bitbucketbot.domain.ReviewerStatus;
+import org.sadtech.bot.vcs.core.domain.ReviewerStatus;
-import org.sadtech.bot.bitbucketbot.domain.entity.PullRequest;
+import org.sadtech.bot.vcs.core.domain.entity.PullRequest;
-import org.sadtech.bot.bitbucketbot.domain.entity.PullRequestMini;
+import org.sadtech.bot.vcs.core.domain.entity.PullRequestMini;
 
 import java.util.List;
 import java.util.Optional;

bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/TaskRepository.java

@@ -1,7 +1,7 @@
-package org.sadtech.bot.bitbucketbot.repository;
+package org.sadtech.bot.vcs.core.repository;
 
 import org.sadtech.basic.context.repository.SimpleManagerRepository;
-import org.sadtech.bot.bitbucketbot.domain.entity.Task;
+import org.sadtech.bot.vcs.core.domain.entity.Task;
 
 import java.time.LocalDateTime;
 import java.util.List;

bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/impl/ChangeRepositoryImpl.java

@@ -1,8 +1,8 @@
-package org.sadtech.bot.bitbucketbot.repository.impl;
+package org.sadtech.bot.vcs.core.repository.impl;
 
 import lombok.NonNull;
-import org.sadtech.bot.bitbucketbot.domain.change.Change;
+import org.sadtech.bot.vcs.core.domain.change.Change;
-import org.sadtech.bot.bitbucketbot.repository.ChangeRepository;
+import org.sadtech.bot.vcs.core.repository.ChangeRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.ArrayList;

bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/impl/CommentRepositoryImpl.java

@@ -1,10 +1,10 @@
-package org.sadtech.bot.bitbucketbot.repository.impl;
+package org.sadtech.bot.vcs.core.repository.impl;
 
 import lombok.NonNull;
 import org.sadtech.basic.database.repository.manager.AbstractSimpleManagerRepository;
-import org.sadtech.bot.bitbucketbot.domain.entity.Comment;
+import org.sadtech.bot.vcs.core.domain.entity.Comment;
-import org.sadtech.bot.bitbucketbot.repository.CommentRepository;
+import org.sadtech.bot.vcs.core.repository.CommentRepository;
-import org.sadtech.bot.bitbucketbot.repository.jpa.CommentRepositoryJpa;
+import org.sadtech.bot.vcs.core.repository.jpa.CommentRepositoryJpa;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;

bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/impl/PersonRepositoryImpl.java

@@ -1,11 +1,11 @@
-package org.sadtech.bot.bitbucketbot.repository.impl;
+package org.sadtech.bot.vcs.core.repository.impl;
 
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.sadtech.bot.bitbucketbot.domain.entity.Person;
+import org.sadtech.bot.vcs.core.domain.entity.Person;
-import org.sadtech.bot.bitbucketbot.repository.PersonRepository;
+import org.sadtech.bot.vcs.core.repository.PersonRepository;
-import org.sadtech.bot.bitbucketbot.repository.jpa.PersonJpaRepository;
+import org.sadtech.bot.vcs.core.repository.jpa.PersonJpaRepository;
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.stereotype.Repository;
 

bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/impl/PullRequestsRepositoryImpl.java

@@ -1,15 +1,15 @@
-package org.sadtech.bot.bitbucketbot.repository.impl;
+package org.sadtech.bot.vcs.core.repository.impl;
 
 import lombok.NonNull;
 import org.sadtech.basic.database.repository.manager.FilterManagerRepository;
-import org.sadtech.bot.bitbucketbot.domain.IdAndStatusPr;
+import org.sadtech.bot.vcs.core.domain.IdAndStatusPr;
-import org.sadtech.bot.bitbucketbot.domain.PullRequestStatus;
+import org.sadtech.bot.vcs.core.domain.PullRequestStatus;
-import org.sadtech.bot.bitbucketbot.domain.ReviewerStatus;
+import org.sadtech.bot.vcs.core.domain.ReviewerStatus;
-import org.sadtech.bot.bitbucketbot.domain.entity.PullRequest;
+import org.sadtech.bot.vcs.core.domain.entity.PullRequest;
-import org.sadtech.bot.bitbucketbot.domain.entity.PullRequestMini;
+import org.sadtech.bot.vcs.core.domain.entity.PullRequestMini;
-import org.sadtech.bot.bitbucketbot.repository.PullRequestsRepository;
+import org.sadtech.bot.vcs.core.repository.PullRequestsRepository;
-import org.sadtech.bot.bitbucketbot.repository.jpa.PullRequestMiniRepositoryJpa;
+import org.sadtech.bot.vcs.core.repository.jpa.PullRequestMiniRepositoryJpa;
-import org.sadtech.bot.bitbucketbot.repository.jpa.PullRequestsRepositoryJpa;
+import org.sadtech.bot.vcs.core.repository.jpa.PullRequestsRepositoryJpa;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;