diff --git a/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/AbstractPullRequestBitbucketParser.java b/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/AbstractPullRequestBitbucketParser.java index f3ffed5..fdb1fa7 100644 --- a/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/AbstractPullRequestBitbucketParser.java +++ b/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/AbstractPullRequestBitbucketParser.java @@ -2,14 +2,14 @@ package org.sadtech.bot.vcs.bitbucket.core; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; -import org.sadtech.bot.vcs.bitbucket.sdk.domain.PullRequestJson; -import org.sadtech.bot.vcs.bitbucket.sdk.domain.sheet.PullRequestSheetJson; -import org.sadtech.bot.vcs.core.utils.Pair; -import org.sadtech.bot.vcs.core.utils.Utils; -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.filter.PullRequestFilter; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PullRequestsService; +import org.sadtech.bot.gitlab.context.domain.IdAndStatusPr; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.context.domain.filter.PullRequestFilter; +import org.sadtech.bot.gitlab.context.service.PullRequestsService; +import org.sadtech.bot.gitlab.core.utils.Pair; +import org.sadtech.bot.gitlab.core.utils.Utils; +import org.sadtech.bot.gitlab.sdk.domain.PullRequestJson; +import org.sadtech.bot.gitlab.sdk.domain.sheet.PullRequestSheetJson; import org.sadtech.bot.vsc.context.domain.PullRequestStatus; import org.sadtech.bot.vsc.context.service.PullRequestParser; import org.springframework.core.convert.ConversionService; diff --git a/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/CommentJsonToComment.java b/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/CommentJsonToComment.java index 5f14bc9..20d7802 100644 --- a/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/CommentJsonToComment.java +++ b/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/CommentJsonToComment.java @@ -1,9 +1,9 @@ package org.sadtech.bot.vcs.bitbucket.core.service.converter; -import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson; -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.entity.Comment; +import org.sadtech.bot.gitlab.context.domain.entity.Comment; +import org.sadtech.bot.gitlab.core.utils.StringUtils; +import org.sadtech.bot.gitlab.sdk.domain.CommentJson; +import org.sadtech.bot.gitlab.sdk.domain.Severity; 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/CommentJsonToTaskConvert.java b/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/CommentJsonToTaskConvert.java index 6c9fac4..594af7e 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,11 +1,11 @@ package org.sadtech.bot.vcs.bitbucket.core.service.converter; -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.bot.gitlab.context.domain.TaskStatus; +import org.sadtech.bot.gitlab.context.domain.entity.Task; +import org.sadtech.bot.gitlab.core.utils.StringUtils; +import org.sadtech.bot.gitlab.sdk.domain.CommentJson; +import org.sadtech.bot.gitlab.sdk.domain.CommentState; +import org.sadtech.bot.gitlab.sdk.domain.Severity; 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 b80ecf3..da3d162 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,15 +1,15 @@ package org.sadtech.bot.vcs.bitbucket.core.service.converter; import lombok.RequiredArgsConstructor; -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; -import org.sadtech.bot.vcs.bitbucket.sdk.domain.PullRequestState; -import org.sadtech.bot.vcs.bitbucket.sdk.domain.UserDecisionJson; -import org.sadtech.bot.vcs.bitbucket.sdk.domain.UserPullRequestStatus; -import org.sadtech.bot.vcs.core.utils.StringUtils; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequest; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Reviewer; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.context.domain.entity.Reviewer; +import org.sadtech.bot.gitlab.core.utils.StringUtils; +import org.sadtech.bot.gitlab.sdk.domain.Outcome; +import org.sadtech.bot.gitlab.sdk.domain.Properties; +import org.sadtech.bot.gitlab.sdk.domain.PullRequestJson; +import org.sadtech.bot.gitlab.sdk.domain.PullRequestState; +import org.sadtech.bot.gitlab.sdk.domain.UserDecisionJson; +import org.sadtech.bot.gitlab.sdk.domain.UserPullRequestStatus; import org.sadtech.bot.vsc.context.domain.PullRequestStatus; import org.sadtech.bot.vsc.context.domain.ReviewerStatus; import org.sadtech.haiti.context.exception.ConvertException; diff --git a/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/UserJsonConverter.java b/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/UserJsonConverter.java index 66e4c8c..c2b0eed 100644 --- a/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/UserJsonConverter.java +++ b/bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/UserJsonConverter.java @@ -1,7 +1,7 @@ package org.sadtech.bot.vcs.bitbucket.core.service.converter; -import org.sadtech.bot.vcs.bitbucket.sdk.domain.UserJson; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.domain.entity.Person; +import org.sadtech.bot.gitlab.sdk.domain.UserJson; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/bot-app/pom.xml b/bot-app/pom.xml index ae0099b..ead43c2 100644 --- a/bot-app/pom.xml +++ b/bot-app/pom.xml @@ -47,7 +47,7 @@ org.sadtech.bot.gitlab - bot-core + gitlab-core diff --git a/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/scheduler/RatingScheduler.java b/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/scheduler/RatingScheduler.java index 771fa7b..a0cfe7a 100644 --- a/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/scheduler/RatingScheduler.java +++ b/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/scheduler/RatingScheduler.java @@ -1,12 +1,12 @@ package org.sadtech.bot.vcs.bitbucket.app.scheduler; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.EntityType; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Person; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.SimpleTextNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.service.NotifyService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PersonService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.RatingService; +import org.sadtech.bot.gitlab.context.domain.EntityType; +import org.sadtech.bot.gitlab.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.domain.notify.SimpleTextNotify; +import org.sadtech.bot.gitlab.context.service.NotifyService; +import org.sadtech.bot.gitlab.context.service.PersonService; +import org.sadtech.bot.gitlab.context.service.RatingService; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/CommentAndTaskParser.java b/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/CommentAndTaskParser.java index 3c58f6d..ff8d1e8 100644 --- a/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/CommentAndTaskParser.java +++ b/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/CommentAndTaskParser.java @@ -1,21 +1,21 @@ package org.sadtech.bot.vcs.bitbucket.app.service; import lombok.NonNull; +import org.sadtech.bot.gitlab.context.domain.entity.Comment; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequestMini; +import org.sadtech.bot.gitlab.context.domain.entity.Task; +import org.sadtech.bot.gitlab.context.exception.NotFoundException; +import org.sadtech.bot.gitlab.context.service.CommentService; +import org.sadtech.bot.gitlab.context.service.PullRequestsService; +import org.sadtech.bot.gitlab.context.service.TaskService; +import org.sadtech.bot.gitlab.core.config.properties.BitbucketProperty; +import org.sadtech.bot.gitlab.core.config.properties.InitProperty; +import org.sadtech.bot.gitlab.core.utils.Utils; +import org.sadtech.bot.gitlab.sdk.domain.CommentJson; +import org.sadtech.bot.gitlab.sdk.domain.Severity; 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; -import org.sadtech.bot.vcs.bitbucket.sdk.domain.Severity; -import org.sadtech.bot.vcs.core.config.properties.BitbucketProperty; -import org.sadtech.bot.vcs.core.config.properties.InitProperty; -import org.sadtech.bot.vcs.core.utils.Utils; -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; diff --git a/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/ExecutorScanner.java b/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/ExecutorScanner.java index da62712..33b88ca 100644 --- a/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/ExecutorScanner.java +++ b/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/ExecutorScanner.java @@ -3,11 +3,11 @@ package org.sadtech.bot.vcs.bitbucket.app.service; import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.sadtech.bot.gitlab.core.config.properties.BitbucketProperty; +import org.sadtech.bot.gitlab.sdk.domain.CommentJson; import org.sadtech.bot.vcs.bitbucket.app.service.executor.DataScan; import org.sadtech.bot.vcs.bitbucket.app.service.executor.Executor; import org.sadtech.bot.vcs.bitbucket.app.service.executor.Seeker; -import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson; -import org.sadtech.bot.vcs.core.config.properties.BitbucketProperty; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/executor/ResultScan.java b/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/executor/ResultScan.java index fafadaa..9931625 100644 --- a/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/executor/ResultScan.java +++ b/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/executor/ResultScan.java @@ -2,7 +2,7 @@ package org.sadtech.bot.vcs.bitbucket.app.service.executor; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson; +import org.sadtech.bot.gitlab.sdk.domain.CommentJson; @Getter @RequiredArgsConstructor diff --git a/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/executor/Seeker.java b/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/executor/Seeker.java index a69103a..0de843c 100644 --- a/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/executor/Seeker.java +++ b/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/executor/Seeker.java @@ -1,8 +1,8 @@ package org.sadtech.bot.vcs.bitbucket.app.service.executor; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson; -import org.sadtech.bot.vcs.core.utils.Utils; +import org.sadtech.bot.gitlab.core.utils.Utils; +import org.sadtech.bot.gitlab.sdk.domain.CommentJson; import java.util.Optional; import java.util.concurrent.Callable; diff --git a/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/parser/PersonBitbucketParser.java b/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/parser/PersonBitbucketParser.java index e9800f3..1df7d2d 100644 --- a/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/parser/PersonBitbucketParser.java +++ b/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/parser/PersonBitbucketParser.java @@ -1,13 +1,13 @@ package org.sadtech.bot.vcs.bitbucket.app.service.parser; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vcs.bitbucket.sdk.domain.UserJson; -import org.sadtech.bot.vcs.bitbucket.sdk.domain.sheet.UserSheetJson; -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.Person; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PersonService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.parser.PersonParser; +import org.sadtech.bot.gitlab.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.service.PersonService; +import org.sadtech.bot.gitlab.context.service.parser.PersonParser; +import org.sadtech.bot.gitlab.core.config.properties.BitbucketProperty; +import org.sadtech.bot.gitlab.core.utils.Utils; +import org.sadtech.bot.gitlab.sdk.domain.UserJson; +import org.sadtech.bot.gitlab.sdk.domain.sheet.UserSheetJson; import org.springframework.core.convert.ConversionService; import org.springframework.stereotype.Service; diff --git a/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/parser/PullRequestBitbucketParser.java b/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/parser/PullRequestBitbucketParser.java index f453e60..3dddcee 100644 --- a/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/parser/PullRequestBitbucketParser.java +++ b/bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/service/parser/PullRequestBitbucketParser.java @@ -1,11 +1,11 @@ package org.sadtech.bot.vcs.bitbucket.app.service.parser; import lombok.extern.slf4j.Slf4j; +import org.sadtech.bot.gitlab.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.service.PersonService; +import org.sadtech.bot.gitlab.context.service.PullRequestsService; +import org.sadtech.bot.gitlab.core.config.properties.BitbucketProperty; import org.sadtech.bot.vcs.bitbucket.core.AbstractPullRequestBitbucketParser; -import org.sadtech.bot.vcs.core.config.properties.BitbucketProperty; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Person; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PersonService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PullRequestsService; import org.sadtech.bot.vsc.context.service.PullRequestParser; import org.springframework.core.convert.ConversionService; import org.springframework.stereotype.Service; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/Answer.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/Answer.java similarity index 87% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/Answer.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/Answer.java index 9e366d4..2441788 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/Answer.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/Answer.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain; +package org.sadtech.bot.gitlab.context.domain; import lombok.AccessLevel; import lombok.Getter; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/EntityType.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/EntityType.java similarity index 72% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/EntityType.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/EntityType.java index 9bcdf08..6a6fc1d 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/EntityType.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/EntityType.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain; +package org.sadtech.bot.gitlab.context.domain; /** * // TODO: 21.09.2020 Добавить описание. diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/IdAndStatusPr.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/IdAndStatusPr.java similarity index 82% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/IdAndStatusPr.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/IdAndStatusPr.java index 0edd73b..5662ddb 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/IdAndStatusPr.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/IdAndStatusPr.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain; +package org.sadtech.bot.gitlab.context.domain; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/MessageSend.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/MessageSend.java similarity index 88% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/MessageSend.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/MessageSend.java index 68164fa..d4f2b08 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/MessageSend.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/MessageSend.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain; +package org.sadtech.bot.gitlab.context.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/PointType.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/PointType.java similarity index 90% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/PointType.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/PointType.java index 6714ac5..f7a0ede 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/PointType.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/PointType.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain; +package org.sadtech.bot.gitlab.context.domain; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/TaskStatus.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/TaskStatus.java new file mode 100644 index 0000000..0548132 --- /dev/null +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/TaskStatus.java @@ -0,0 +1,8 @@ +package org.sadtech.bot.gitlab.context.domain; + +public enum TaskStatus { + + OPEN, + RESOLVED + +} diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Chat.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Chat.java similarity index 90% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Chat.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Chat.java index 05be85f..6b4ac1d 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Chat.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Chat.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.entity; +package org.sadtech.bot.gitlab.context.domain.entity; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Comment.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Comment.java similarity index 95% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Comment.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Comment.java index 4b9ae58..ddb2629 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Comment.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Comment.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.entity; +package org.sadtech.bot.gitlab.context.domain.entity; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/NotifySetting.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/NotifySetting.java similarity index 93% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/NotifySetting.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/NotifySetting.java index a329268..d1b2c59 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/NotifySetting.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/NotifySetting.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.entity; +package org.sadtech.bot.gitlab.context.domain.entity; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Person.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Person.java similarity index 93% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Person.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Person.java index 9cf9fc6..21d62d1 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Person.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Person.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.entity; +package org.sadtech.bot.gitlab.context.domain.entity; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/PullRequest.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/PullRequest.java similarity index 98% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/PullRequest.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/PullRequest.java index 44bfa96..ff50102 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/PullRequest.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/PullRequest.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.entity; +package org.sadtech.bot.gitlab.context.domain.entity; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/PullRequestMini.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/PullRequestMini.java similarity index 93% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/PullRequestMini.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/PullRequestMini.java index fd28ede..fc2ac33 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/PullRequestMini.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/PullRequestMini.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.entity; +package org.sadtech.bot.gitlab.context.domain.entity; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/RatingHistory.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/RatingHistory.java similarity index 88% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/RatingHistory.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/RatingHistory.java index c01042b..9c14969 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/RatingHistory.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/RatingHistory.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.entity; +package org.sadtech.bot.gitlab.context.domain.entity; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.PointType; +import org.sadtech.bot.gitlab.context.domain.PointType; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/RatingList.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/RatingList.java similarity index 92% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/RatingList.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/RatingList.java index c721121..c0298e6 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/RatingList.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/RatingList.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.entity; +package org.sadtech.bot.gitlab.context.domain.entity; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Reviewer.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Reviewer.java similarity index 96% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Reviewer.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Reviewer.java index af4df30..aafdec0 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Reviewer.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Reviewer.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.entity; +package org.sadtech.bot.gitlab.context.domain.entity; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Task.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Task.java similarity index 93% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Task.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Task.java index 41913d5..3b858a8 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Task.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Task.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.entity; +package org.sadtech.bot.gitlab.context.domain.entity; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.TaskStatus; +import org.sadtech.bot.gitlab.context.domain.TaskStatus; import javax.persistence.CollectionTable; import javax.persistence.Column; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/filter/PullRequestFilter.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/filter/PullRequestFilter.java similarity index 85% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/filter/PullRequestFilter.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/filter/PullRequestFilter.java index ce01518..973861d 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/filter/PullRequestFilter.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/filter/PullRequestFilter.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.filter; +package org.sadtech.bot.gitlab.context.domain.filter; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/GoodMorningNotify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/GoodMorningNotify.java similarity index 86% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/GoodMorningNotify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/GoodMorningNotify.java index 0642dd0..b644f82 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/GoodMorningNotify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/GoodMorningNotify.java @@ -1,12 +1,12 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify; +package org.sadtech.bot.gitlab.context.domain.notify; import lombok.Builder; import lombok.Getter; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.EntityType; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequest; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.MessageUtils; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.Smile; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.UpdateDataComparator; +import org.sadtech.bot.gitlab.context.domain.EntityType; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.context.utils.MessageUtils; +import org.sadtech.bot.gitlab.context.utils.Smile; +import org.sadtech.bot.gitlab.context.utils.UpdateDataComparator; import java.util.List; import java.util.Set; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/Notify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/Notify.java similarity index 88% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/Notify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/Notify.java index d5ec905..60f8d18 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/Notify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/Notify.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify; +package org.sadtech.bot.gitlab.context.domain.notify; import lombok.Getter; import lombok.NonNull; import lombok.Setter; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.EntityType; +import org.sadtech.bot.gitlab.context.domain.EntityType; import java.util.Set; import java.util.stream.Collectors; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/SimpleTextNotify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/SimpleTextNotify.java similarity index 80% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/SimpleTextNotify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/SimpleTextNotify.java index 85499da..8f74d43 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/SimpleTextNotify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/SimpleTextNotify.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify; +package org.sadtech.bot.gitlab.context.domain.notify; import lombok.Builder; import lombok.Getter; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.EntityType; +import org.sadtech.bot.gitlab.context.domain.EntityType; import java.util.Set; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/AnswerCommentNotify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/comment/AnswerCommentNotify.java similarity index 80% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/AnswerCommentNotify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/comment/AnswerCommentNotify.java index b5dfc3e..4105b53 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/AnswerCommentNotify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/comment/AnswerCommentNotify.java @@ -1,11 +1,11 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.comment; +package org.sadtech.bot.gitlab.context.domain.notify.comment; import lombok.Builder; import lombok.Getter; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.Answer; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.EntityType; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.Notify; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.Smile; +import org.sadtech.bot.gitlab.context.domain.Answer; +import org.sadtech.bot.gitlab.context.domain.EntityType; +import org.sadtech.bot.gitlab.context.domain.notify.Notify; +import org.sadtech.bot.gitlab.context.utils.Smile; import java.text.MessageFormat; import java.util.List; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/CommentNotify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/comment/CommentNotify.java similarity index 76% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/CommentNotify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/comment/CommentNotify.java index c1ae43b..e1280d4 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/CommentNotify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/comment/CommentNotify.java @@ -1,10 +1,10 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.comment; +package org.sadtech.bot.gitlab.context.domain.notify.comment; import lombok.Builder; import lombok.Getter; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.EntityType; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.Notify; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.Smile; +import org.sadtech.bot.gitlab.context.domain.EntityType; +import org.sadtech.bot.gitlab.context.domain.notify.Notify; +import org.sadtech.bot.gitlab.context.utils.Smile; import java.text.MessageFormat; import java.util.Set; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/ConflictPrNotify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/ConflictPrNotify.java similarity index 85% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/ConflictPrNotify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/ConflictPrNotify.java index fc5a254..411c15b 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/ConflictPrNotify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/ConflictPrNotify.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.pullrequest; +package org.sadtech.bot.gitlab.context.domain.notify.pullrequest; import lombok.Builder; import lombok.Getter; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.Smile; +import org.sadtech.bot.gitlab.context.utils.Smile; import java.text.MessageFormat; import java.util.Set; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/ForgottenSmartPrNotify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/ForgottenSmartPrNotify.java similarity index 86% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/ForgottenSmartPrNotify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/ForgottenSmartPrNotify.java index 67e97e2..9d90d81 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/ForgottenSmartPrNotify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/ForgottenSmartPrNotify.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.pullrequest; +package org.sadtech.bot.gitlab.context.domain.notify.pullrequest; import lombok.Builder; import lombok.Getter; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.Smile; +import org.sadtech.bot.gitlab.context.utils.Smile; import java.text.MessageFormat; import java.util.Set; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/NewPrNotify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/NewPrNotify.java similarity index 89% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/NewPrNotify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/NewPrNotify.java index f909a80..7fb3013 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/NewPrNotify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/NewPrNotify.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.pullrequest; +package org.sadtech.bot.gitlab.context.domain.notify.pullrequest; import lombok.Builder; import lombok.Getter; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.Smile; +import org.sadtech.bot.gitlab.context.utils.Smile; import java.text.MessageFormat; import java.util.Set; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/PrNotify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/PrNotify.java similarity index 74% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/PrNotify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/PrNotify.java index 3a5493c..89cf87e 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/PrNotify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/PrNotify.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.pullrequest; +package org.sadtech.bot.gitlab.context.domain.notify.pullrequest; import lombok.Getter; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.EntityType; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.Notify; +import org.sadtech.bot.gitlab.context.domain.EntityType; +import org.sadtech.bot.gitlab.context.domain.notify.Notify; import java.util.Set; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/ReviewersPrNotify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/ReviewersPrNotify.java similarity index 83% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/ReviewersPrNotify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/ReviewersPrNotify.java index 4485da1..b919d30 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/ReviewersPrNotify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/ReviewersPrNotify.java @@ -1,18 +1,18 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.pullrequest; +package org.sadtech.bot.gitlab.context.domain.notify.pullrequest; import lombok.Builder; import lombok.Getter; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.util.ReviewerChange; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.Smile; +import org.sadtech.bot.gitlab.context.domain.util.ReviewerChange; +import org.sadtech.bot.gitlab.context.utils.Smile; import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import static org.sadtech.bot.vsc.bitbucketbot.context.domain.util.ReviewerChange.Type.DELETED; -import static org.sadtech.bot.vsc.bitbucketbot.context.domain.util.ReviewerChange.Type.NEW; -import static org.sadtech.bot.vsc.bitbucketbot.context.domain.util.ReviewerChange.Type.OLD; +import static org.sadtech.bot.gitlab.context.domain.util.ReviewerChange.Type.DELETED; +import static org.sadtech.bot.gitlab.context.domain.util.ReviewerChange.Type.NEW; +import static org.sadtech.bot.gitlab.context.domain.util.ReviewerChange.Type.OLD; @Getter public class ReviewersPrNotify extends PrNotify { diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/SmartPrNotify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/SmartPrNotify.java similarity index 84% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/SmartPrNotify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/SmartPrNotify.java index 66fed75..e4ba4f5 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/SmartPrNotify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/SmartPrNotify.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.pullrequest; +package org.sadtech.bot.gitlab.context.domain.notify.pullrequest; import lombok.Builder; import lombok.Getter; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Reviewer; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.Smile; +import org.sadtech.bot.gitlab.context.domain.entity.Reviewer; +import org.sadtech.bot.gitlab.context.utils.Smile; import java.text.MessageFormat; import java.util.Set; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/StatusPrNotify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/StatusPrNotify.java similarity index 89% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/StatusPrNotify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/StatusPrNotify.java index f119633..d12b244 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/StatusPrNotify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/StatusPrNotify.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.pullrequest; +package org.sadtech.bot.gitlab.context.domain.notify.pullrequest; import lombok.Builder; import lombok.Getter; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.Smile; +import org.sadtech.bot.gitlab.context.utils.Smile; import org.sadtech.bot.vsc.context.domain.PullRequestStatus; import java.text.MessageFormat; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/UpdatePrNotify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/UpdatePrNotify.java similarity index 86% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/UpdatePrNotify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/UpdatePrNotify.java index 7e3418d..f22b935 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/UpdatePrNotify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/UpdatePrNotify.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.pullrequest; +package org.sadtech.bot.gitlab.context.domain.notify.pullrequest; import lombok.Builder; import lombok.Getter; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.Smile; +import org.sadtech.bot.gitlab.context.utils.Smile; import java.text.MessageFormat; import java.util.Set; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/task/TaskCloseNotify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/task/TaskCloseNotify.java similarity index 85% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/task/TaskCloseNotify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/task/TaskCloseNotify.java index 8b05cbe..da0e2fc 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/task/TaskCloseNotify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/task/TaskCloseNotify.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.task; +package org.sadtech.bot.gitlab.context.domain.notify.task; import lombok.Builder; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.Smile; +import org.sadtech.bot.gitlab.context.utils.Smile; import java.text.MessageFormat; import java.util.Set; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/task/TaskNewNotify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/task/TaskNewNotify.java similarity index 86% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/task/TaskNewNotify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/task/TaskNewNotify.java index 21493b2..f5937b0 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/task/TaskNewNotify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/task/TaskNewNotify.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.task; +package org.sadtech.bot.gitlab.context.domain.notify.task; import lombok.Builder; import lombok.Getter; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.Smile; +import org.sadtech.bot.gitlab.context.utils.Smile; import java.text.MessageFormat; import java.util.Set; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/task/TaskNotify.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/task/TaskNotify.java similarity index 74% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/task/TaskNotify.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/task/TaskNotify.java index 142377e..23b831b 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/task/TaskNotify.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/task/TaskNotify.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.task; +package org.sadtech.bot.gitlab.context.domain.notify.task; import lombok.EqualsAndHashCode; import lombok.Getter; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.EntityType; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.Notify; +import org.sadtech.bot.gitlab.context.domain.EntityType; +import org.sadtech.bot.gitlab.context.domain.notify.Notify; import java.util.Set; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/util/ReviewerChange.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/util/ReviewerChange.java similarity index 95% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/util/ReviewerChange.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/util/ReviewerChange.java index 461811f..17f9d02 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/util/ReviewerChange.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/util/ReviewerChange.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain.util; +package org.sadtech.bot.gitlab.context.domain.util; import lombok.Getter; import lombok.NonNull; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/BitbucketBotException.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/BitbucketBotException.java similarity index 81% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/BitbucketBotException.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/BitbucketBotException.java index 339540a..0058aeb 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/BitbucketBotException.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/BitbucketBotException.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.exception; +package org.sadtech.bot.gitlab.context.exception; abstract class BitbucketBotException extends RuntimeException { diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/NotFoundException.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/NotFoundException.java similarity index 70% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/NotFoundException.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/NotFoundException.java index ced6db3..a6610e1 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/NotFoundException.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/NotFoundException.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.exception; +package org.sadtech.bot.gitlab.context.exception; public class NotFoundException extends BitbucketBotException { diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/RegException.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/RegException.java similarity index 69% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/RegException.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/RegException.java index 5c94f8e..b31433f 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/RegException.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/RegException.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.exception; +package org.sadtech.bot.gitlab.context.exception; public class RegException extends BitbucketBotException { diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/UpdateException.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/UpdateException.java similarity index 70% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/UpdateException.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/UpdateException.java index afb4618..ed30e60 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/UpdateException.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/UpdateException.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.exception; +package org.sadtech.bot.gitlab.context.exception; public class UpdateException extends BitbucketBotException { diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/ChatRepository.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/ChatRepository.java similarity index 73% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/ChatRepository.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/ChatRepository.java index d855b27..6c4faa6 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/ChatRepository.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/ChatRepository.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.repository; +package org.sadtech.bot.gitlab.context.repository; import lombok.NonNull; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Chat; +import org.sadtech.bot.gitlab.context.domain.entity.Chat; import org.sadtech.haiti.context.repository.SimpleManagerRepository; import java.util.Set; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/CommentRepository.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/CommentRepository.java similarity index 82% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/CommentRepository.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/CommentRepository.java index fc0b256..2248e0f 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/CommentRepository.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/CommentRepository.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.repository; +package org.sadtech.bot.gitlab.context.repository; import lombok.NonNull; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Comment; +import org.sadtech.bot.gitlab.context.domain.entity.Comment; import org.sadtech.haiti.context.repository.SimpleManagerRepository; import java.time.LocalDateTime; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/NotifySettingRepository.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/NotifySettingRepository.java similarity index 75% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/NotifySettingRepository.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/NotifySettingRepository.java index 0b13523..660fc4a 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/NotifySettingRepository.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/NotifySettingRepository.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.repository; +package org.sadtech.bot.gitlab.context.repository; import lombok.NonNull; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.NotifySetting; +import org.sadtech.bot.gitlab.context.domain.entity.NotifySetting; import org.sadtech.haiti.context.repository.SimpleManagerRepository; import java.util.Set; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/PersonRepository.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/PersonRepository.java similarity index 82% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/PersonRepository.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/PersonRepository.java index 8c12747..1311ce0 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/PersonRepository.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/PersonRepository.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.repository; +package org.sadtech.bot.gitlab.context.repository; import lombok.NonNull; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.domain.entity.Person; import java.util.List; import java.util.Optional; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/PullRequestsRepository.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/PullRequestsRepository.java similarity index 74% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/PullRequestsRepository.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/PullRequestsRepository.java index e9491b4..658eb5a 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/PullRequestsRepository.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/PullRequestsRepository.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.repository; +package org.sadtech.bot.gitlab.context.repository; import lombok.NonNull; -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.gitlab.context.domain.IdAndStatusPr; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.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; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingHistoryRepository.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/RatingHistoryRepository.java similarity index 76% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingHistoryRepository.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/RatingHistoryRepository.java index 03bf23a..e6842e1 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingHistoryRepository.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/RatingHistoryRepository.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.repository; +package org.sadtech.bot.gitlab.context.repository; import lombok.NonNull; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.RatingHistory; +import org.sadtech.bot.gitlab.context.domain.entity.RatingHistory; import org.sadtech.haiti.context.repository.SimpleManagerRepository; import java.time.LocalDateTime; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingListRepository.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/RatingListRepository.java similarity index 77% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingListRepository.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/RatingListRepository.java index 1cc223a..9643e8c 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingListRepository.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/RatingListRepository.java @@ -1,6 +1,6 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.repository; +package org.sadtech.bot.gitlab.context.repository; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.RatingList; +import org.sadtech.bot.gitlab.context.domain.entity.RatingList; import org.sadtech.haiti.context.repository.SimpleManagerRepository; import java.util.List; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/TaskRepository.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/TaskRepository.java similarity index 71% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/TaskRepository.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/TaskRepository.java index 8ee3a7b..e30d30e 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/TaskRepository.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/TaskRepository.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.repository; +package org.sadtech.bot.gitlab.context.repository; import lombok.NonNull; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.TaskStatus; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Task; +import org.sadtech.bot.gitlab.context.domain.TaskStatus; +import org.sadtech.bot.gitlab.context.domain.entity.Task; import org.sadtech.haiti.context.repository.SimpleManagerRepository; import java.time.LocalDateTime; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/ChatService.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/ChatService.java similarity index 80% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/ChatService.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/ChatService.java index e617357..3cc3f22 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/ChatService.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/ChatService.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.service; +package org.sadtech.bot.gitlab.context.service; import lombok.NonNull; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/CommentService.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/CommentService.java similarity index 72% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/CommentService.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/CommentService.java index 1962e68..3d54f4c 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/CommentService.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/CommentService.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.service; +package org.sadtech.bot.gitlab.context.service; import lombok.NonNull; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Comment; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Task; +import org.sadtech.bot.gitlab.context.domain.entity.Comment; +import org.sadtech.bot.gitlab.context.domain.entity.Task; import org.sadtech.haiti.context.service.SimpleManagerService; import java.time.LocalDateTime; diff --git a/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/MessageSendService.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/MessageSendService.java new file mode 100644 index 0000000..8b761ba --- /dev/null +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/MessageSendService.java @@ -0,0 +1,11 @@ +package org.sadtech.bot.gitlab.context.service; + +import lombok.NonNull; +import org.sadtech.bot.gitlab.context.domain.notify.Notify; + +@FunctionalInterface +public interface MessageSendService { + + void send(@NonNull Notify notify); + +} diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/NotifyService.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/NotifyService.java similarity index 75% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/NotifyService.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/NotifyService.java index 23b46d9..961bd4f 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/NotifyService.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/NotifyService.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.service; +package org.sadtech.bot.gitlab.context.service; import lombok.NonNull; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.NotifySetting; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.Notify; +import org.sadtech.bot.gitlab.context.domain.entity.NotifySetting; +import org.sadtech.bot.gitlab.context.domain.notify.Notify; import java.util.Optional; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PersonService.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/PersonService.java similarity index 81% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PersonService.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/PersonService.java index a3cf5d7..03f0db4 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PersonService.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/PersonService.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.service; +package org.sadtech.bot.gitlab.context.service; import lombok.NonNull; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.domain.entity.Person; import java.util.Collection; import java.util.List; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PullRequestsService.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/PullRequestsService.java similarity index 82% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PullRequestsService.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/PullRequestsService.java index ddd4607..30a5ded 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PullRequestsService.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/PullRequestsService.java @@ -1,10 +1,10 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.service; +package org.sadtech.bot.gitlab.context.service; import lombok.NonNull; -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.gitlab.context.domain.IdAndStatusPr; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequestMini; +import org.sadtech.bot.gitlab.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; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/RatingService.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/RatingService.java similarity index 72% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/RatingService.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/RatingService.java index a55592e..a8406a7 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/RatingService.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/RatingService.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.service; +package org.sadtech.bot.gitlab.context.service; import lombok.NonNull; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.PointType; +import org.sadtech.bot.gitlab.context.domain.PointType; /** * // TODO: 01.10.2020 Добавить описание. diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/TaskService.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/TaskService.java similarity index 64% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/TaskService.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/TaskService.java index f059677..30e247c 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/TaskService.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/TaskService.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.service; +package org.sadtech.bot.gitlab.context.service; import lombok.NonNull; -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.bot.gitlab.context.domain.TaskStatus; +import org.sadtech.bot.gitlab.context.domain.entity.Comment; +import org.sadtech.bot.gitlab.context.domain.entity.Task; import org.sadtech.haiti.context.service.SimpleManagerService; import java.time.LocalDateTime; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/parser/PersonParser.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/parser/PersonParser.java similarity index 79% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/parser/PersonParser.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/parser/PersonParser.java index 2a8a8a3..b5427b6 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/parser/PersonParser.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/parser/PersonParser.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.service.parser; +package org.sadtech.bot.gitlab.context.service.parser; /** * // TODO: 06.09.2020 Добавить описание. diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/MessageUtils.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/utils/MessageUtils.java similarity index 93% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/MessageUtils.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/utils/MessageUtils.java index 15f7464..2364380 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/MessageUtils.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/utils/MessageUtils.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.utils; +package org.sadtech.bot.gitlab.context.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.NonNull; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequest; import java.util.List; import java.util.Optional; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/Smile.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/utils/Smile.java similarity index 96% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/Smile.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/utils/Smile.java index d5d929d..713d965 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/Smile.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/utils/Smile.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.utils; +package org.sadtech.bot.gitlab.context.utils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/UpdateDataComparator.java b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/utils/UpdateDataComparator.java similarity index 67% rename from bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/UpdateDataComparator.java rename to bot-context/src/main/java/org/sadtech/bot/gitlab/context/utils/UpdateDataComparator.java index 57c9187..f1144c0 100644 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/UpdateDataComparator.java +++ b/bot-context/src/main/java/org/sadtech/bot/gitlab/context/utils/UpdateDataComparator.java @@ -1,6 +1,6 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.utils; +package org.sadtech.bot.gitlab.context.utils; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequest; import java.util.Comparator; diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/TaskStatus.java b/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/TaskStatus.java deleted file mode 100644 index 2fae02d..0000000 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/TaskStatus.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.domain; - -public enum TaskStatus { - - OPEN, - RESOLVED - -} diff --git a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/MessageSendService.java b/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/MessageSendService.java deleted file mode 100644 index 262087e..0000000 --- a/bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/MessageSendService.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.sadtech.bot.vsc.bitbucketbot.context.service; - -import lombok.NonNull; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.Notify; - -@FunctionalInterface -public interface MessageSendService { - - void send(@NonNull Notify notify); - -} diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/AppProperty.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/AppProperty.java similarity index 88% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/AppProperty.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/AppProperty.java index 376a7bd..09008bf 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/AppProperty.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/AppProperty.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.core.config.properties; +package org.sadtech.bot.gitlab.core.config.properties; import lombok.Getter; import lombok.Setter; diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/BitbucketProperty.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/BitbucketProperty.java similarity index 95% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/BitbucketProperty.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/BitbucketProperty.java index a6df97c..596aa5f 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/BitbucketProperty.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/BitbucketProperty.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.core.config.properties; +package org.sadtech.bot.gitlab.core.config.properties; import lombok.Getter; import lombok.Setter; diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/InitProperty.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/InitProperty.java similarity index 86% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/InitProperty.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/InitProperty.java index bbc8314..7697c35 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/InitProperty.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/InitProperty.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.core.config.properties; +package org.sadtech.bot.gitlab.core.config.properties; import lombok.Getter; import lombok.Setter; diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/RatingProperty.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/RatingProperty.java similarity index 88% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/RatingProperty.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/RatingProperty.java index 2bb5503..7b9c125 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/RatingProperty.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/RatingProperty.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.core.config.properties; +package org.sadtech.bot.gitlab.core.config.properties; import lombok.Getter; import lombok.Setter; diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/scheduler/NotificationScheduler.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/scheduler/NotificationScheduler.java similarity index 82% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/scheduler/NotificationScheduler.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/scheduler/NotificationScheduler.java index 7d1dd1c..90cd306 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/scheduler/NotificationScheduler.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/scheduler/NotificationScheduler.java @@ -1,16 +1,16 @@ -package org.sadtech.bot.vcs.core.scheduler; +package org.sadtech.bot.gitlab.core.scheduler; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vcs.core.config.properties.AppProperty; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.EntityType; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Person; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequest; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.GoodMorningNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.SimpleTextNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.service.NotifyService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PersonService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PullRequestsService; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.Smile; +import org.sadtech.bot.gitlab.context.domain.EntityType; +import org.sadtech.bot.gitlab.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.context.domain.notify.GoodMorningNotify; +import org.sadtech.bot.gitlab.context.domain.notify.SimpleTextNotify; +import org.sadtech.bot.gitlab.context.service.NotifyService; +import org.sadtech.bot.gitlab.context.service.PersonService; +import org.sadtech.bot.gitlab.context.service.PullRequestsService; +import org.sadtech.bot.gitlab.context.utils.Smile; +import org.sadtech.bot.gitlab.core.config.properties.AppProperty; import org.sadtech.bot.vsc.context.domain.PullRequestStatus; import org.sadtech.bot.vsc.context.domain.ReviewerStatus; import org.springframework.scheduling.annotation.Scheduled; diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/converter/CommentToTaskConvert.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/converter/CommentToTaskConvert.java similarity index 78% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/service/converter/CommentToTaskConvert.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/converter/CommentToTaskConvert.java index 68026b9..587fac5 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/converter/CommentToTaskConvert.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/converter/CommentToTaskConvert.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vcs.core.service.converter; +package org.sadtech.bot.gitlab.core.service.converter; -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.bot.gitlab.context.domain.TaskStatus; +import org.sadtech.bot.gitlab.context.domain.entity.Comment; +import org.sadtech.bot.gitlab.context.domain.entity.Task; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/converter/TaskToCommentConvert.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/converter/TaskToCommentConvert.java similarity index 83% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/service/converter/TaskToCommentConvert.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/converter/TaskToCommentConvert.java index 5b9e150..189ec6e 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/converter/TaskToCommentConvert.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/converter/TaskToCommentConvert.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vcs.core.service.converter; +package org.sadtech.bot.gitlab.core.service.converter; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Comment; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Task; +import org.sadtech.bot.gitlab.context.domain.entity.Comment; +import org.sadtech.bot.gitlab.context.domain.entity.Task; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/ChatServiceImpl.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/ChatServiceImpl.java similarity index 73% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/ChatServiceImpl.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/ChatServiceImpl.java index a9b72a8..c21584a 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/ChatServiceImpl.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/ChatServiceImpl.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vcs.core.service.impl; +package org.sadtech.bot.gitlab.core.service.impl; import lombok.NonNull; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vsc.bitbucketbot.context.repository.ChatRepository; -import org.sadtech.bot.vsc.bitbucketbot.context.service.ChatService; +import org.sadtech.bot.gitlab.context.repository.ChatRepository; +import org.sadtech.bot.gitlab.context.service.ChatService; import org.springframework.stereotype.Service; import java.util.Set; 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/gitlab/core/service/impl/CommentServiceImpl.java similarity index 87% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/CommentServiceImpl.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/CommentServiceImpl.java index d7fab8a..d8fd0c8 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/gitlab/core/service/impl/CommentServiceImpl.java @@ -1,18 +1,18 @@ -package org.sadtech.bot.vcs.core.service.impl; +package org.sadtech.bot.gitlab.core.service.impl; import lombok.NonNull; -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; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Task; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.comment.AnswerCommentNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.comment.CommentNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.exception.NotFoundException; -import org.sadtech.bot.vsc.bitbucketbot.context.repository.CommentRepository; -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.bot.gitlab.context.domain.Answer; +import org.sadtech.bot.gitlab.context.domain.PointType; +import org.sadtech.bot.gitlab.context.domain.entity.Comment; +import org.sadtech.bot.gitlab.context.domain.entity.Task; +import org.sadtech.bot.gitlab.context.domain.notify.comment.AnswerCommentNotify; +import org.sadtech.bot.gitlab.context.domain.notify.comment.CommentNotify; +import org.sadtech.bot.gitlab.context.exception.NotFoundException; +import org.sadtech.bot.gitlab.context.repository.CommentRepository; +import org.sadtech.bot.gitlab.context.service.CommentService; +import org.sadtech.bot.gitlab.context.service.NotifyService; +import org.sadtech.bot.gitlab.context.service.RatingService; +import org.sadtech.bot.gitlab.context.service.TaskService; import org.sadtech.haiti.core.service.AbstractSimpleManagerService; import org.sadtech.haiti.core.util.Assert; import org.springframework.context.annotation.Lazy; diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/NotifyServiceImpl.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/NotifyServiceImpl.java similarity index 66% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/NotifyServiceImpl.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/NotifyServiceImpl.java index b942d6b..9059388 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/NotifyServiceImpl.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/NotifyServiceImpl.java @@ -1,13 +1,13 @@ -package org.sadtech.bot.vcs.core.service.impl; +package org.sadtech.bot.gitlab.core.service.impl; import lombok.NonNull; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.EntityType; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.NotifySetting; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.Notify; -import org.sadtech.bot.vsc.bitbucketbot.context.repository.NotifySettingRepository; -import org.sadtech.bot.vsc.bitbucketbot.context.service.MessageSendService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.NotifyService; +import org.sadtech.bot.gitlab.context.domain.EntityType; +import org.sadtech.bot.gitlab.context.domain.entity.NotifySetting; +import org.sadtech.bot.gitlab.context.domain.notify.Notify; +import org.sadtech.bot.gitlab.context.repository.NotifySettingRepository; +import org.sadtech.bot.gitlab.context.service.MessageSendService; +import org.sadtech.bot.gitlab.context.service.NotifyService; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/PersonServiceImpl.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/PersonServiceImpl.java similarity index 85% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/PersonServiceImpl.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/PersonServiceImpl.java index 8050efa..095dda0 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/PersonServiceImpl.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/PersonServiceImpl.java @@ -1,15 +1,15 @@ -package org.sadtech.bot.vcs.core.service.impl; +package org.sadtech.bot.gitlab.core.service.impl; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; -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; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Person; -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.bot.gitlab.context.domain.entity.NotifySetting; +import org.sadtech.bot.gitlab.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.exception.RegException; +import org.sadtech.bot.gitlab.context.repository.PersonRepository; +import org.sadtech.bot.gitlab.context.service.NotifyService; +import org.sadtech.bot.gitlab.context.service.PersonService; +import org.sadtech.bot.gitlab.core.config.properties.BitbucketProperty; +import org.sadtech.bot.gitlab.core.utils.Utils; import org.sadtech.haiti.core.util.Assert; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/PullRequestsServiceImpl.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/PullRequestsServiceImpl.java similarity index 89% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/PullRequestsServiceImpl.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/PullRequestsServiceImpl.java index 20bb371..7ef89c0 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/PullRequestsServiceImpl.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/PullRequestsServiceImpl.java @@ -1,27 +1,26 @@ -package org.sadtech.bot.vcs.core.service.impl; +package org.sadtech.bot.gitlab.core.service.impl; import lombok.NonNull; -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; -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.PullRequest_; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Reviewer; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.filter.PullRequestFilter; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.pullrequest.ConflictPrNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.pullrequest.ForgottenSmartPrNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.pullrequest.NewPrNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.pullrequest.ReviewersPrNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.pullrequest.SmartPrNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.pullrequest.StatusPrNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.pullrequest.UpdatePrNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.util.ReviewerChange; -import org.sadtech.bot.vsc.bitbucketbot.context.exception.UpdateException; -import org.sadtech.bot.vsc.bitbucketbot.context.repository.PullRequestsRepository; -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.gitlab.context.domain.IdAndStatusPr; +import org.sadtech.bot.gitlab.context.domain.PointType; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequestMini; +import org.sadtech.bot.gitlab.context.domain.entity.Reviewer; +import org.sadtech.bot.gitlab.context.domain.filter.PullRequestFilter; +import org.sadtech.bot.gitlab.context.domain.notify.pullrequest.ConflictPrNotify; +import org.sadtech.bot.gitlab.context.domain.notify.pullrequest.ForgottenSmartPrNotify; +import org.sadtech.bot.gitlab.context.domain.notify.pullrequest.NewPrNotify; +import org.sadtech.bot.gitlab.context.domain.notify.pullrequest.ReviewersPrNotify; +import org.sadtech.bot.gitlab.context.domain.notify.pullrequest.SmartPrNotify; +import org.sadtech.bot.gitlab.context.domain.notify.pullrequest.StatusPrNotify; +import org.sadtech.bot.gitlab.context.domain.notify.pullrequest.UpdatePrNotify; +import org.sadtech.bot.gitlab.context.domain.util.ReviewerChange; +import org.sadtech.bot.gitlab.context.exception.UpdateException; +import org.sadtech.bot.gitlab.context.repository.PullRequestsRepository; +import org.sadtech.bot.gitlab.context.service.NotifyService; +import org.sadtech.bot.gitlab.context.service.PullRequestsService; +import org.sadtech.bot.gitlab.context.service.RatingService; +import org.sadtech.bot.gitlab.core.config.properties.RatingProperty; import org.sadtech.bot.vsc.context.domain.PullRequestStatus; import org.sadtech.bot.vsc.context.domain.ReviewerStatus; import org.sadtech.haiti.context.page.Pagination; @@ -351,8 +350,8 @@ public class PullRequestsServiceImpl extends AbstractSimpleManagerService new UpdateException("ПР с таким id не существует")); } diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/RatingServiceImpl.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/RatingServiceImpl.java similarity index 87% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/RatingServiceImpl.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/RatingServiceImpl.java index 31d4365..49bf273 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/RatingServiceImpl.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/RatingServiceImpl.java @@ -1,17 +1,17 @@ -package org.sadtech.bot.vcs.core.service.impl; +package org.sadtech.bot.gitlab.core.service.impl; import lombok.NonNull; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.PointType; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Person; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.RatingHistory; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.RatingList; -import org.sadtech.bot.vsc.bitbucketbot.context.exception.NotFoundException; -import org.sadtech.bot.vsc.bitbucketbot.context.repository.RatingHistoryRepository; -import org.sadtech.bot.vsc.bitbucketbot.context.repository.RatingListRepository; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PersonService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.RatingService; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.Smile; +import org.sadtech.bot.gitlab.context.domain.PointType; +import org.sadtech.bot.gitlab.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.domain.entity.RatingHistory; +import org.sadtech.bot.gitlab.context.domain.entity.RatingList; +import org.sadtech.bot.gitlab.context.exception.NotFoundException; +import org.sadtech.bot.gitlab.context.repository.RatingHistoryRepository; +import org.sadtech.bot.gitlab.context.repository.RatingListRepository; +import org.sadtech.bot.gitlab.context.service.PersonService; +import org.sadtech.bot.gitlab.context.service.RatingService; +import org.sadtech.bot.gitlab.context.utils.Smile; import org.springframework.stereotype.Service; import java.time.LocalDateTime; diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/TaskServiceImpl.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/TaskServiceImpl.java similarity index 86% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/TaskServiceImpl.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/TaskServiceImpl.java index 4fed162..d350319 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/TaskServiceImpl.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/TaskServiceImpl.java @@ -1,23 +1,23 @@ -package org.sadtech.bot.vcs.core.service.impl; +package org.sadtech.bot.gitlab.core.service.impl; import lombok.NonNull; -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; -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.Task; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.comment.AnswerCommentNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.comment.CommentNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.task.TaskCloseNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.task.TaskNewNotify; -import org.sadtech.bot.vsc.bitbucketbot.context.exception.NotFoundException; -import org.sadtech.bot.vsc.bitbucketbot.context.repository.TaskRepository; -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.PullRequestsService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.RatingService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.TaskService; +import org.sadtech.bot.gitlab.context.domain.Answer; +import org.sadtech.bot.gitlab.context.domain.PointType; +import org.sadtech.bot.gitlab.context.domain.TaskStatus; +import org.sadtech.bot.gitlab.context.domain.entity.Comment; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.context.domain.entity.Task; +import org.sadtech.bot.gitlab.context.domain.notify.comment.AnswerCommentNotify; +import org.sadtech.bot.gitlab.context.domain.notify.comment.CommentNotify; +import org.sadtech.bot.gitlab.context.domain.notify.task.TaskCloseNotify; +import org.sadtech.bot.gitlab.context.domain.notify.task.TaskNewNotify; +import org.sadtech.bot.gitlab.context.exception.NotFoundException; +import org.sadtech.bot.gitlab.context.repository.TaskRepository; +import org.sadtech.bot.gitlab.context.service.CommentService; +import org.sadtech.bot.gitlab.context.service.NotifyService; +import org.sadtech.bot.gitlab.context.service.PullRequestsService; +import org.sadtech.bot.gitlab.context.service.RatingService; +import org.sadtech.bot.gitlab.context.service.TaskService; import org.sadtech.haiti.core.service.AbstractSimpleManagerService; import org.sadtech.haiti.core.util.Assert; import org.springframework.core.convert.ConversionService; diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/filter/PullRequestFilterService.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/filter/PullRequestFilterService.java similarity index 63% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/filter/PullRequestFilterService.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/filter/PullRequestFilterService.java index 56a7642..1494f6a 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/filter/PullRequestFilterService.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/filter/PullRequestFilterService.java @@ -1,10 +1,9 @@ -package org.sadtech.bot.vcs.core.service.impl.filter; +package org.sadtech.bot.gitlab.core.service.impl.filter; import lombok.NonNull; -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.bot.gitlab.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.context.domain.filter.PullRequestFilter; +import org.sadtech.bot.gitlab.context.repository.PullRequestsRepository; import org.sadtech.haiti.core.service.AbstractFilterService; import org.sadtech.haiti.filter.Filter; import org.sadtech.haiti.filter.FilterQuery; @@ -29,7 +28,7 @@ public class PullRequestFilterService extends AbstractFilterServicecreate() - .matchPhrase(PullRequest_.BITBUCKET_ID, filter.getBitbucketId()) - .matchPhrase(PullRequest_.REPOSITORY_ID, filter.getBitbucketRepositoryId()); + .matchPhrase("hyita", filter.getBitbucketId()) + .matchPhrase("hyita", filter.getBitbucketRepositoryId()); } } diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/utils/Pair.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/utils/Pair.java similarity index 91% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/utils/Pair.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/utils/Pair.java index 8f86274..e6ec872 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/utils/Pair.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/utils/Pair.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.core.utils; +package org.sadtech.bot.gitlab.core.utils; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/utils/StringUtils.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/utils/StringUtils.java similarity index 91% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/utils/StringUtils.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/utils/StringUtils.java index 559b39f..a865b44 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/utils/StringUtils.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/utils/StringUtils.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.core.utils; +package org.sadtech.bot.gitlab.core.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/utils/Utils.java b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/utils/Utils.java similarity index 97% rename from bot-core/src/main/java/org/sadtech/bot/vcs/core/utils/Utils.java rename to bot-core/src/main/java/org/sadtech/bot/gitlab/core/utils/Utils.java index 2b1a1e3..368d6e1 100644 --- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/utils/Utils.java +++ b/bot-core/src/main/java/org/sadtech/bot/gitlab/core/utils/Utils.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.core.utils; +package org.sadtech.bot.gitlab.core.utils; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/ChatRepositoryImpl.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/ChatRepositoryImpl.java similarity index 74% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/ChatRepositoryImpl.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/ChatRepositoryImpl.java index 44922ce..f07645a 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/ChatRepositoryImpl.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/ChatRepositoryImpl.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.impl; +package org.sadtech.bot.gitlab.data.impl; import lombok.NonNull; -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.bot.gitlab.context.domain.entity.Chat; +import org.sadtech.bot.gitlab.context.repository.ChatRepository; +import org.sadtech.bot.gitlab.data.jpa.ChatJpaRepository; import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/CommentRepositoryImpl.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/CommentRepositoryImpl.java similarity index 82% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/CommentRepositoryImpl.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/CommentRepositoryImpl.java index 858f05c..8911e00 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/CommentRepositoryImpl.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/CommentRepositoryImpl.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.impl; +package org.sadtech.bot.gitlab.data.impl; import lombok.NonNull; -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.bot.gitlab.context.domain.entity.Comment; +import org.sadtech.bot.gitlab.context.repository.CommentRepository; +import org.sadtech.bot.gitlab.data.jpa.CommentRepositoryJpa; import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/NotifySettingRepositoryImpl.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/NotifySettingRepositoryImpl.java similarity index 78% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/NotifySettingRepositoryImpl.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/NotifySettingRepositoryImpl.java index 2677bc9..a9915b1 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/NotifySettingRepositoryImpl.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/NotifySettingRepositoryImpl.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.impl; +package org.sadtech.bot.gitlab.data.impl; import lombok.NonNull; -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.bot.gitlab.context.domain.entity.NotifySetting; +import org.sadtech.bot.gitlab.context.repository.NotifySettingRepository; +import org.sadtech.bot.gitlab.data.jpa.NotifySettingJpaRepository; import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/PersonRepositoryImpl.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/PersonRepositoryImpl.java similarity index 87% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/PersonRepositoryImpl.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/PersonRepositoryImpl.java index 642d4fd..102fb2e 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/PersonRepositoryImpl.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/PersonRepositoryImpl.java @@ -1,11 +1,11 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.impl; +package org.sadtech.bot.gitlab.data.impl; import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.sadtech.bot.vcs.bitbucketbot.data.jpa.PersonJpaRepository; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Person; -import org.sadtech.bot.vsc.bitbucketbot.context.repository.PersonRepository; +import org.sadtech.bot.gitlab.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.repository.PersonRepository; +import org.sadtech.bot.gitlab.data.jpa.PersonJpaRepository; import org.springframework.dao.InvalidDataAccessResourceUsageException; import org.springframework.stereotype.Repository; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/PullRequestsRepositoryImpl.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/PullRequestsRepositoryImpl.java similarity index 76% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/PullRequestsRepositoryImpl.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/PullRequestsRepositoryImpl.java index 7e6d37e..052b60f 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/PullRequestsRepositoryImpl.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/PullRequestsRepositoryImpl.java @@ -1,12 +1,12 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.impl; +package org.sadtech.bot.gitlab.data.impl; import lombok.NonNull; -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; -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.repository.PullRequestsRepository; +import org.sadtech.bot.gitlab.context.domain.IdAndStatusPr; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequestMini; +import org.sadtech.bot.gitlab.context.repository.PullRequestsRepository; +import org.sadtech.bot.gitlab.data.jpa.PullRequestMiniRepositoryJpa; +import org.sadtech.bot.gitlab.data.jpa.PullRequestsRepositoryJpa; import org.sadtech.bot.vsc.context.domain.PullRequestStatus; import org.sadtech.bot.vsc.context.domain.ReviewerStatus; import org.sadtech.haiti.database.repository.manager.FilterManagerRepository; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingHistoryRepositoryImpl.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/RatingHistoryRepositoryImpl.java similarity index 75% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingHistoryRepositoryImpl.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/RatingHistoryRepositoryImpl.java index 9a0e8cd..4558aa7 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingHistoryRepositoryImpl.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/RatingHistoryRepositoryImpl.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.impl; +package org.sadtech.bot.gitlab.data.impl; import lombok.NonNull; -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.bot.gitlab.context.domain.entity.RatingHistory; +import org.sadtech.bot.gitlab.context.repository.RatingHistoryRepository; +import org.sadtech.bot.gitlab.data.jpa.RatingHistoryJpaRepository; import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingListRepositoryImpl.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/RatingListRepositoryImpl.java similarity index 80% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingListRepositoryImpl.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/RatingListRepositoryImpl.java index 285c6be..47f0adb 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingListRepositoryImpl.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/RatingListRepositoryImpl.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.impl; +package org.sadtech.bot.gitlab.data.impl; -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.bot.gitlab.context.domain.entity.RatingList; +import org.sadtech.bot.gitlab.context.repository.RatingListRepository; +import org.sadtech.bot.gitlab.data.jpa.RatingListJpaRepository; import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/TaskRepositoryImpl.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/TaskRepositoryImpl.java similarity index 77% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/TaskRepositoryImpl.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/TaskRepositoryImpl.java index da6510c..1aab95a 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/TaskRepositoryImpl.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/TaskRepositoryImpl.java @@ -1,10 +1,10 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.impl; +package org.sadtech.bot.gitlab.data.impl; import lombok.NonNull; -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.bot.gitlab.context.domain.TaskStatus; +import org.sadtech.bot.gitlab.context.domain.entity.Task; +import org.sadtech.bot.gitlab.context.repository.TaskRepository; +import org.sadtech.bot.gitlab.data.jpa.TaskRepositoryJpa; import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/ChatJpaRepository.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/ChatJpaRepository.java similarity index 81% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/ChatJpaRepository.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/ChatJpaRepository.java index 9737305..314fad8 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/ChatJpaRepository.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/ChatJpaRepository.java @@ -1,6 +1,6 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.jpa; +package org.sadtech.bot.gitlab.data.jpa; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Chat; +import org.sadtech.bot.gitlab.context.domain.entity.Chat; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/CommentRepositoryJpa.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/CommentRepositoryJpa.java similarity index 83% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/CommentRepositoryJpa.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/CommentRepositoryJpa.java index 605e05f..48e6a2f 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/CommentRepositoryJpa.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/CommentRepositoryJpa.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.jpa; +package org.sadtech.bot.gitlab.data.jpa; import lombok.NonNull; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Comment; +import org.sadtech.bot.gitlab.context.domain.entity.Comment; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/NotifySettingJpaRepository.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/NotifySettingJpaRepository.java similarity index 85% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/NotifySettingJpaRepository.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/NotifySettingJpaRepository.java index e888c2d..eed2131 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/NotifySettingJpaRepository.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/NotifySettingJpaRepository.java @@ -1,6 +1,6 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.jpa; +package org.sadtech.bot.gitlab.data.jpa; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.NotifySetting; +import org.sadtech.bot.gitlab.context.domain.entity.NotifySetting; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/PersonJpaRepository.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/PersonJpaRepository.java similarity index 88% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/PersonJpaRepository.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/PersonJpaRepository.java index cd3021f..f9f9a0c 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/PersonJpaRepository.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/PersonJpaRepository.java @@ -1,6 +1,6 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.jpa; +package org.sadtech.bot.gitlab.data.jpa; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.domain.entity.Person; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/PullRequestMiniRepositoryJpa.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/PullRequestMiniRepositoryJpa.java similarity index 66% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/PullRequestMiniRepositoryJpa.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/PullRequestMiniRepositoryJpa.java index a1071ff..a379a47 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/PullRequestMiniRepositoryJpa.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/PullRequestMiniRepositoryJpa.java @@ -1,6 +1,6 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.jpa; +package org.sadtech.bot.gitlab.data.jpa; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequestMini; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequestMini; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/PullRequestsRepositoryJpa.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/PullRequestsRepositoryJpa.java similarity index 91% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/PullRequestsRepositoryJpa.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/PullRequestsRepositoryJpa.java index 001c149..05e31cf 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/PullRequestsRepositoryJpa.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/PullRequestsRepositoryJpa.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.jpa; +package org.sadtech.bot.gitlab.data.jpa; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.IdAndStatusPr; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.context.domain.IdAndStatusPr; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequest; import org.sadtech.bot.vsc.context.domain.PullRequestStatus; import org.sadtech.bot.vsc.context.domain.ReviewerStatus; import org.springframework.data.jpa.repository.Query; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/RatingHistoryJpaRepository.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/RatingHistoryJpaRepository.java similarity index 75% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/RatingHistoryJpaRepository.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/RatingHistoryJpaRepository.java index 2081977..56883ba 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/RatingHistoryJpaRepository.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/RatingHistoryJpaRepository.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.jpa; +package org.sadtech.bot.gitlab.data.jpa; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.RatingHistory; +import org.sadtech.bot.gitlab.context.domain.entity.RatingHistory; import org.springframework.data.jpa.repository.JpaRepository; import java.time.LocalDateTime; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/RatingListJpaRepository.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/RatingListJpaRepository.java similarity index 79% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/RatingListJpaRepository.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/RatingListJpaRepository.java index 443208a..3c71741 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/RatingListJpaRepository.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/RatingListJpaRepository.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.jpa; +package org.sadtech.bot.gitlab.data.jpa; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.RatingList; +import org.sadtech.bot.gitlab.context.domain.entity.RatingList; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/TaskRepositoryJpa.java b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/TaskRepositoryJpa.java similarity index 72% rename from bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/TaskRepositoryJpa.java rename to bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/TaskRepositoryJpa.java index b814124..43d6a13 100644 --- a/bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/TaskRepositoryJpa.java +++ b/bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/TaskRepositoryJpa.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vcs.bitbucketbot.data.jpa; +package org.sadtech.bot.gitlab.data.jpa; import lombok.NonNull; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.TaskStatus; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Task; +import org.sadtech.bot.gitlab.context.domain.TaskStatus; +import org.sadtech.bot.gitlab.context.domain.entity.Task; import org.springframework.data.jpa.repository.JpaRepository; import java.time.LocalDateTime; diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/BitbucketUserRole.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/BitbucketUserRole.java similarity index 76% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/BitbucketUserRole.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/BitbucketUserRole.java index 993fff5..fdcb7f7 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/BitbucketUserRole.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/BitbucketUserRole.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; /** * TODO: Добавить комментарий енума. diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/CommentJson.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/CommentJson.java similarity index 83% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/CommentJson.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/CommentJson.java index a6ec07d..4fe6eb4 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/CommentJson.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/CommentJson.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.Data; -import org.sadtech.bot.vcs.bitbucket.sdk.utils.LocalDateTimeFromEpochDeserializer; +import org.sadtech.bot.gitlab.sdk.utils.LocalDateTimeFromEpochDeserializer; import java.time.LocalDateTime; import java.util.List; diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/CommentState.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/CommentState.java similarity index 52% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/CommentState.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/CommentState.java index f9cba55..7dc75f2 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/CommentState.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/CommentState.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; public enum CommentState { diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/FromRefJson.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/FromRefJson.java similarity index 79% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/FromRefJson.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/FromRefJson.java index bb3f6a9..744d59d 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/FromRefJson.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/FromRefJson.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; import lombok.Data; diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/LinkJson.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/LinkJson.java similarity index 80% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/LinkJson.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/LinkJson.java index ddd9bc2..203bc32 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/LinkJson.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/LinkJson.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; import lombok.Data; diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/MergeResult.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/MergeResult.java similarity index 63% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/MergeResult.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/MergeResult.java index 3b9538c..20fbc8e 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/MergeResult.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/MergeResult.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; import lombok.Data; diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Outcome.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/Outcome.java similarity index 51% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Outcome.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/Outcome.java index bd3c3b4..a0b4997 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Outcome.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/Outcome.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; public enum Outcome { diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/ProjectJson.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/ProjectJson.java similarity index 62% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/ProjectJson.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/ProjectJson.java index 895581e..40f4e0a 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/ProjectJson.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/ProjectJson.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; import lombok.Data; diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Properties.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/Properties.java similarity index 81% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Properties.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/Properties.java index fc6d251..4e66a9e 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Properties.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/Properties.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; import lombok.Data; diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/PullRequestJson.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/PullRequestJson.java similarity index 86% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/PullRequestJson.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/PullRequestJson.java index 685d204..e5c31f6 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/PullRequestJson.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/PullRequestJson.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.Data; -import org.sadtech.bot.vcs.bitbucket.sdk.utils.LocalDateTimeFromEpochDeserializer; +import org.sadtech.bot.gitlab.sdk.utils.LocalDateTimeFromEpochDeserializer; import java.time.LocalDateTime; import java.util.List; diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/PullRequestState.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/PullRequestState.java similarity index 76% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/PullRequestState.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/PullRequestState.java index e1ff0d6..9b61eb6 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/PullRequestState.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/PullRequestState.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; /** * TODO: Добавить комментарий енума. diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/RepositoryJson.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/RepositoryJson.java similarity index 82% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/RepositoryJson.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/RepositoryJson.java index 5d54a58..49e41f3 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/RepositoryJson.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/RepositoryJson.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; import lombok.Data; diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/SelfJson.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/SelfJson.java similarity index 78% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/SelfJson.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/SelfJson.java index 8ce9b4e..52534b2 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/SelfJson.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/SelfJson.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; import lombok.Data; diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Severity.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/Severity.java similarity index 50% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Severity.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/Severity.java index eb45448..4b0f946 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Severity.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/Severity.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; public enum Severity { diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Sheet.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/Sheet.java similarity index 89% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Sheet.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/Sheet.java index fb5444a..0b3fc73 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Sheet.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/Sheet.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; import lombok.Data; diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/UserDecisionJson.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/UserDecisionJson.java similarity index 85% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/UserDecisionJson.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/UserDecisionJson.java index da8d655..d409127 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/UserDecisionJson.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/UserDecisionJson.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; import lombok.Data; diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/UserJson.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/UserJson.java similarity index 80% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/UserJson.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/UserJson.java index f18856c..fb4c0e7 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/UserJson.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/UserJson.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; import lombok.Data; diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/UserPullRequestStatus.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/UserPullRequestStatus.java similarity index 78% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/UserPullRequestStatus.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/UserPullRequestStatus.java index 1d739d0..f1e1e8b 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/UserPullRequestStatus.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/UserPullRequestStatus.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.domain; +package org.sadtech.bot.gitlab.sdk.domain; /** * TODO: Добавить комментарий енума. diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/sheet/PullRequestSheetJson.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/sheet/PullRequestSheetJson.java new file mode 100644 index 0000000..93292fa --- /dev/null +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/sheet/PullRequestSheetJson.java @@ -0,0 +1,13 @@ +package org.sadtech.bot.gitlab.sdk.domain.sheet; + +import org.sadtech.bot.gitlab.sdk.domain.PullRequestJson; +import org.sadtech.bot.gitlab.sdk.domain.Sheet; + +/** + * TODO: Добавить описание класса. + * + * @author upagge [02.02.2020] + */ +public class PullRequestSheetJson extends Sheet { + +} diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/sheet/UserSheetJson.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/sheet/UserSheetJson.java new file mode 100644 index 0000000..c24ab84 --- /dev/null +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/domain/sheet/UserSheetJson.java @@ -0,0 +1,13 @@ +package org.sadtech.bot.gitlab.sdk.domain.sheet; + +import org.sadtech.bot.gitlab.sdk.domain.Sheet; +import org.sadtech.bot.gitlab.sdk.domain.UserJson; + +/** + * TODO: Добавить описание класса. + * + * @author upagge [02.02.2020] + */ +public class UserSheetJson extends Sheet { + +} diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/utils/LocalDateTimeFromEpochDeserializer.java b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/utils/LocalDateTimeFromEpochDeserializer.java similarity index 93% rename from gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/utils/LocalDateTimeFromEpochDeserializer.java rename to gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/utils/LocalDateTimeFromEpochDeserializer.java index 4411238..b2bdb99 100644 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/utils/LocalDateTimeFromEpochDeserializer.java +++ b/gitlab-sdk/src/main/java/org/sadtech/bot/gitlab/sdk/utils/LocalDateTimeFromEpochDeserializer.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.bitbucket.sdk.utils; +package org.sadtech.bot.gitlab.sdk.utils; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/sheet/PullRequestSheetJson.java b/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/sheet/PullRequestSheetJson.java deleted file mode 100644 index 4986669..0000000 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/sheet/PullRequestSheetJson.java +++ /dev/null @@ -1,13 +0,0 @@ -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 { - -} diff --git a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/sheet/UserSheetJson.java b/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/sheet/UserSheetJson.java deleted file mode 100644 index 701c217..0000000 --- a/gitlab-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/sheet/UserSheetJson.java +++ /dev/null @@ -1,13 +0,0 @@ -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 { - -} diff --git a/pom.xml b/pom.xml index 624772e..65a15cc 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,6 @@ 3.0.1-RELEASE 3.0.1-RELEASE 3.0.1-RELEASE - 3.0.1-RELEASE 3.0.1-RELEASE 3.0.1-RELEASE @@ -118,12 +117,12 @@ org.sadtech.bot.gitlab bot-core - ${sadtech.gitlab.core.version} + ${gitlab.core.version} org.sadtech.bot.gitlab - bot-core + gitlab-core ${gitlab.core.version} diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/config/property/TeamcityProperty.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/config/property/TeamcityProperty.java similarity index 88% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/config/property/TeamcityProperty.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/config/property/TeamcityProperty.java index 1ef0bd0..c2759c5 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/config/property/TeamcityProperty.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/config/property/TeamcityProperty.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.teamcity.core.config.property; +package org.sadtech.bot.gitlab.teamcity.core.config.property; import lombok.Getter; import lombok.Setter; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/domain/TeamcityBuildNotify.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/domain/TeamcityBuildNotify.java similarity index 77% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/domain/TeamcityBuildNotify.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/domain/TeamcityBuildNotify.java index cf9ed32..01cacf9 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/domain/TeamcityBuildNotify.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/domain/TeamcityBuildNotify.java @@ -1,12 +1,12 @@ -package org.sadtech.bot.vcs.teamcity.core.domain; +package org.sadtech.bot.gitlab.teamcity.core.domain; import lombok.Builder; import lombok.Getter; -import org.sadtech.bot.vcs.teamcity.core.domain.entity.BuildShort; -import org.sadtech.bot.vcs.teamcity.sdk.BuildStatus; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.EntityType; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.Notify; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.Smile; +import org.sadtech.bot.gitlab.context.domain.EntityType; +import org.sadtech.bot.gitlab.context.domain.notify.Notify; +import org.sadtech.bot.gitlab.context.utils.Smile; +import org.sadtech.bot.gitlab.teamcity.core.domain.entity.BuildShort; +import org.sadtech.bot.gitlab.teamcity.sdk.BuildStatus; import java.text.MessageFormat; import java.util.Set; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/domain/entity/BuildShort.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/domain/entity/BuildShort.java similarity index 87% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/domain/entity/BuildShort.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/domain/entity/BuildShort.java index e89ada0..29c9b85 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/domain/entity/BuildShort.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/domain/entity/BuildShort.java @@ -1,10 +1,10 @@ -package org.sadtech.bot.vcs.teamcity.core.domain.entity; +package org.sadtech.bot.gitlab.teamcity.core.domain.entity; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.sadtech.bot.vcs.teamcity.sdk.BuildState; -import org.sadtech.bot.vcs.teamcity.sdk.BuildStatus; +import org.sadtech.bot.gitlab.teamcity.sdk.BuildState; +import org.sadtech.bot.gitlab.teamcity.sdk.BuildStatus; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/domain/entity/TeamcityProject.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/domain/entity/TeamcityProject.java similarity index 92% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/domain/entity/TeamcityProject.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/domain/entity/TeamcityProject.java index 008c1ab..aa514a4 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/domain/entity/TeamcityProject.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/domain/entity/TeamcityProject.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.teamcity.core.domain.entity; +package org.sadtech.bot.gitlab.teamcity.core.domain.entity; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/domain/entity/TeamcitySetting.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/domain/entity/TeamcitySetting.java similarity index 90% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/domain/entity/TeamcitySetting.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/domain/entity/TeamcitySetting.java index 8d4a8b2..cf00d38 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/domain/entity/TeamcitySetting.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/domain/entity/TeamcitySetting.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vcs.teamcity.core.domain.entity; +package org.sadtech.bot.gitlab.teamcity.core.domain.entity; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.EntityType; +import org.sadtech.bot.gitlab.context.domain.EntityType; import javax.persistence.Column; import javax.persistence.Entity; 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/gitlab/teamcity/core/repository/BuildShortRepository.java similarity index 73% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/BuildShortRepository.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/BuildShortRepository.java index a050c9a..fa3d880 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/gitlab/teamcity/core/repository/BuildShortRepository.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vcs.teamcity.core.repository; +package org.sadtech.bot.gitlab.teamcity.core.repository; import lombok.NonNull; -import org.sadtech.bot.vcs.teamcity.core.domain.entity.BuildShort; +import org.sadtech.bot.gitlab.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/gitlab/teamcity/core/repository/TeamcityProjectRepository.java similarity index 75% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/TeamcityProjectRepository.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/TeamcityProjectRepository.java index c0941da..122c1f1 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/gitlab/teamcity/core/repository/TeamcityProjectRepository.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vcs.teamcity.core.repository; +package org.sadtech.bot.gitlab.teamcity.core.repository; import lombok.NonNull; -import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcityProject; +import org.sadtech.bot.gitlab.teamcity.core.domain.entity.TeamcityProject; 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/TeamcitySettingRepository.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/TeamcitySettingRepository.java similarity index 74% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/TeamcitySettingRepository.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/TeamcitySettingRepository.java index cda2299..99668bb 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/gitlab/teamcity/core/repository/TeamcitySettingRepository.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vcs.teamcity.core.repository; +package org.sadtech.bot.gitlab.teamcity.core.repository; import lombok.NonNull; -import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcitySetting; +import org.sadtech.bot.gitlab.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/gitlab/teamcity/core/repository/impl/BuildShortRepositoryImpl.java similarity index 72% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/impl/BuildShortRepositoryImpl.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/impl/BuildShortRepositoryImpl.java index 20ef468..9662562 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/gitlab/teamcity/core/repository/impl/BuildShortRepositoryImpl.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vcs.teamcity.core.repository.impl; +package org.sadtech.bot.gitlab.teamcity.core.repository.impl; import lombok.NonNull; -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.bot.gitlab.teamcity.core.domain.entity.BuildShort; +import org.sadtech.bot.gitlab.teamcity.core.repository.BuildShortRepository; +import org.sadtech.bot.gitlab.teamcity.core.repository.jpa.BuildShortJpaRepository; import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; 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/gitlab/teamcity/core/repository/impl/TeamcityProjectRepositoryImpl.java similarity index 75% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/impl/TeamcityProjectRepositoryImpl.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/impl/TeamcityProjectRepositoryImpl.java index 80f250e..141ba57 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/gitlab/teamcity/core/repository/impl/TeamcityProjectRepositoryImpl.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vcs.teamcity.core.repository.impl; +package org.sadtech.bot.gitlab.teamcity.core.repository.impl; import lombok.NonNull; -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.bot.gitlab.teamcity.core.domain.entity.TeamcityProject; +import org.sadtech.bot.gitlab.teamcity.core.repository.TeamcityProjectRepository; +import org.sadtech.bot.gitlab.teamcity.core.repository.jpa.TeamcityProjectJpaRepository; import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; 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/gitlab/teamcity/core/repository/impl/TeamcitySettingRepositoryImpl.java similarity index 73% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/impl/TeamcitySettingRepositoryImpl.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/impl/TeamcitySettingRepositoryImpl.java index 855ffda..59e7ea1 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/gitlab/teamcity/core/repository/impl/TeamcitySettingRepositoryImpl.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vcs.teamcity.core.repository.impl; +package org.sadtech.bot.gitlab.teamcity.core.repository.impl; import lombok.NonNull; -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.bot.gitlab.teamcity.core.domain.entity.TeamcitySetting; +import org.sadtech.bot.gitlab.teamcity.core.repository.TeamcitySettingRepository; +import org.sadtech.bot.gitlab.teamcity.core.repository.jpa.TeamcitySettingJpaRepository; import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository; import org.springframework.stereotype.Repository; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/jpa/BuildShortJpaRepository.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/jpa/BuildShortJpaRepository.java similarity index 79% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/jpa/BuildShortJpaRepository.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/jpa/BuildShortJpaRepository.java index ae29c54..e72e491 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/jpa/BuildShortJpaRepository.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/jpa/BuildShortJpaRepository.java @@ -1,6 +1,6 @@ -package org.sadtech.bot.vcs.teamcity.core.repository.jpa; +package org.sadtech.bot.gitlab.teamcity.core.repository.jpa; -import org.sadtech.bot.vcs.teamcity.core.domain.entity.BuildShort; +import org.sadtech.bot.gitlab.teamcity.core.domain.entity.BuildShort; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/jpa/TeamcityProjectJpaRepository.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/jpa/TeamcityProjectJpaRepository.java similarity index 80% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/jpa/TeamcityProjectJpaRepository.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/jpa/TeamcityProjectJpaRepository.java index 50489de..0e924c8 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/jpa/TeamcityProjectJpaRepository.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/jpa/TeamcityProjectJpaRepository.java @@ -1,6 +1,6 @@ -package org.sadtech.bot.vcs.teamcity.core.repository.jpa; +package org.sadtech.bot.gitlab.teamcity.core.repository.jpa; -import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcityProject; +import org.sadtech.bot.gitlab.teamcity.core.domain.entity.TeamcityProject; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/jpa/TeamcitySettingJpaRepository.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/jpa/TeamcitySettingJpaRepository.java similarity index 71% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/jpa/TeamcitySettingJpaRepository.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/jpa/TeamcitySettingJpaRepository.java index b10a6c1..b102cb1 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/repository/jpa/TeamcitySettingJpaRepository.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/repository/jpa/TeamcitySettingJpaRepository.java @@ -1,6 +1,6 @@ -package org.sadtech.bot.vcs.teamcity.core.repository.jpa; +package org.sadtech.bot.gitlab.teamcity.core.repository.jpa; -import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcitySetting; +import org.sadtech.bot.gitlab.teamcity.core.domain.entity.TeamcitySetting; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/scheduler/TeamcityProjectScheduler.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/scheduler/TeamcityProjectScheduler.java similarity index 76% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/scheduler/TeamcityProjectScheduler.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/scheduler/TeamcityProjectScheduler.java index a75269c..0465677 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/scheduler/TeamcityProjectScheduler.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/scheduler/TeamcityProjectScheduler.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vcs.teamcity.core.scheduler; +package org.sadtech.bot.gitlab.teamcity.core.scheduler; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vcs.teamcity.core.service.parser.BuildShortParser; -import org.sadtech.bot.vcs.teamcity.core.service.parser.TeamcityProjectParser; +import org.sadtech.bot.gitlab.teamcity.core.service.parser.BuildShortParser; +import org.sadtech.bot.gitlab.teamcity.core.service.parser.TeamcityProjectParser; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; 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/gitlab/teamcity/core/service/BuildShortService.java similarity index 71% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/BuildShortService.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/BuildShortService.java index 8d0058d..6b73403 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/gitlab/teamcity/core/service/BuildShortService.java @@ -1,6 +1,6 @@ -package org.sadtech.bot.vcs.teamcity.core.service; +package org.sadtech.bot.gitlab.teamcity.core.service; -import org.sadtech.bot.vcs.teamcity.core.domain.entity.BuildShort; +import org.sadtech.bot.gitlab.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/gitlab/teamcity/core/service/TeamcityProjectService.java similarity index 75% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/TeamcityProjectService.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/TeamcityProjectService.java index 7431956..d68850c 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/gitlab/teamcity/core/service/TeamcityProjectService.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vcs.teamcity.core.service; +package org.sadtech.bot.gitlab.teamcity.core.service; import lombok.NonNull; -import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcityProject; +import org.sadtech.bot.gitlab.teamcity.core.domain.entity.TeamcityProject; 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/TeamcitySettingService.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/TeamcitySettingService.java similarity index 74% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/TeamcitySettingService.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/TeamcitySettingService.java index ca981d2..c935e22 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/gitlab/teamcity/core/service/TeamcitySettingService.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vcs.teamcity.core.service; +package org.sadtech.bot.gitlab.teamcity.core.service; import lombok.NonNull; -import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcitySetting; +import org.sadtech.bot.gitlab.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/convert/BuildShotJsonToBuildShortConvert.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/convert/BuildShotJsonToBuildShortConvert.java similarity index 83% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/convert/BuildShotJsonToBuildShortConvert.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/convert/BuildShotJsonToBuildShortConvert.java index 038dd75..3fe637c 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/convert/BuildShotJsonToBuildShortConvert.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/convert/BuildShotJsonToBuildShortConvert.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vcs.teamcity.core.service.convert; +package org.sadtech.bot.gitlab.teamcity.core.service.convert; -import org.sadtech.bot.vcs.teamcity.core.domain.entity.BuildShort; -import org.sadtech.bot.vcs.teamcity.sdk.BuildShortJson; +import org.sadtech.bot.gitlab.teamcity.core.domain.entity.BuildShort; +import org.sadtech.bot.gitlab.teamcity.sdk.BuildShortJson; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/convert/TeamcityProjectJsonToTeamcityProjectConvert.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/convert/TeamcityProjectJsonToTeamcityProjectConvert.java similarity index 78% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/convert/TeamcityProjectJsonToTeamcityProjectConvert.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/convert/TeamcityProjectJsonToTeamcityProjectConvert.java index 42e5187..23d2be7 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/convert/TeamcityProjectJsonToTeamcityProjectConvert.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/convert/TeamcityProjectJsonToTeamcityProjectConvert.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vcs.teamcity.core.service.convert; +package org.sadtech.bot.gitlab.teamcity.core.service.convert; -import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcityProject; -import org.sadtech.bot.vcs.teamcity.sdk.TeamcityProjectJson; +import org.sadtech.bot.gitlab.teamcity.core.domain.entity.TeamcityProject; +import org.sadtech.bot.gitlab.teamcity.sdk.TeamcityProjectJson; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; 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/gitlab/teamcity/core/service/impl/BuildShortServiceImpl.java similarity index 81% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/impl/BuildShortServiceImpl.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/impl/BuildShortServiceImpl.java index 43f4954..6a8948b 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/gitlab/teamcity/core/service/impl/BuildShortServiceImpl.java @@ -1,14 +1,14 @@ -package org.sadtech.bot.vcs.teamcity.core.service.impl; +package org.sadtech.bot.gitlab.teamcity.core.service.impl; import lombok.NonNull; -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; -import org.sadtech.bot.vcs.teamcity.core.repository.BuildShortRepository; -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.bot.gitlab.context.service.NotifyService; +import org.sadtech.bot.gitlab.teamcity.core.domain.TeamcityBuildNotify; +import org.sadtech.bot.gitlab.teamcity.core.domain.entity.BuildShort; +import org.sadtech.bot.gitlab.teamcity.core.domain.entity.TeamcitySetting; +import org.sadtech.bot.gitlab.teamcity.core.repository.BuildShortRepository; +import org.sadtech.bot.gitlab.teamcity.core.service.BuildShortService; +import org.sadtech.bot.gitlab.teamcity.core.service.TeamcitySettingService; +import org.sadtech.bot.gitlab.teamcity.sdk.BuildStatus; import org.sadtech.haiti.core.service.AbstractSimpleManagerService; import org.springframework.stereotype.Service; 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/gitlab/teamcity/core/service/impl/TeamcityProjectServiceImpl.java similarity index 80% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/impl/TeamcityProjectServiceImpl.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/impl/TeamcityProjectServiceImpl.java index be25429..9eb35ee 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/gitlab/teamcity/core/service/impl/TeamcityProjectServiceImpl.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vcs.teamcity.core.service.impl; +package org.sadtech.bot.gitlab.teamcity.core.service.impl; import lombok.NonNull; -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.bot.gitlab.teamcity.core.domain.entity.TeamcityProject; +import org.sadtech.bot.gitlab.teamcity.core.repository.TeamcityProjectRepository; +import org.sadtech.bot.gitlab.teamcity.core.service.TeamcityProjectService; import org.sadtech.haiti.core.service.AbstractSimpleManagerService; import org.springframework.stereotype.Service; 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/gitlab/teamcity/core/service/impl/TeamcitySettingServiceImpl.java similarity index 78% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/impl/TeamcitySettingServiceImpl.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/impl/TeamcitySettingServiceImpl.java index bb0314f..d55d72b 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/gitlab/teamcity/core/service/impl/TeamcitySettingServiceImpl.java @@ -1,9 +1,9 @@ -package org.sadtech.bot.vcs.teamcity.core.service.impl; +package org.sadtech.bot.gitlab.teamcity.core.service.impl; import lombok.NonNull; -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.bot.gitlab.teamcity.core.domain.entity.TeamcitySetting; +import org.sadtech.bot.gitlab.teamcity.core.repository.TeamcitySettingRepository; +import org.sadtech.bot.gitlab.teamcity.core.service.TeamcitySettingService; import org.sadtech.haiti.core.service.AbstractSimpleManagerService; import org.springframework.stereotype.Service; 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/gitlab/teamcity/core/service/parser/BuildShortParser.java similarity index 78% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/parser/BuildShortParser.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/parser/BuildShortParser.java index 0aae4ee..4b07dcb 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/gitlab/teamcity/core/service/parser/BuildShortParser.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.teamcity.core.service.parser; +package org.sadtech.bot.gitlab.teamcity.core.service.parser; /** * // TODO: 21.09.2020 Добавить описание. @@ -7,14 +7,14 @@ package org.sadtech.bot.vcs.teamcity.core.service.parser; */ import lombok.RequiredArgsConstructor; -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; -import org.sadtech.bot.vcs.teamcity.core.domain.entity.TeamcityProject; -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.bot.gitlab.core.utils.Utils; +import org.sadtech.bot.gitlab.teamcity.core.config.property.TeamcityProperty; +import org.sadtech.bot.gitlab.teamcity.core.domain.entity.BuildShort; +import org.sadtech.bot.gitlab.teamcity.core.domain.entity.TeamcityProject; +import org.sadtech.bot.gitlab.teamcity.core.service.BuildShortService; +import org.sadtech.bot.gitlab.teamcity.core.service.TeamcityProjectService; +import org.sadtech.bot.gitlab.teamcity.sdk.BuildShortJson; +import org.sadtech.bot.gitlab.teamcity.sdk.sheet.BuildShortJsonSheet; import org.sadtech.haiti.context.page.Sheet; import org.sadtech.haiti.core.page.PaginationImpl; import org.springframework.core.convert.ConversionService; diff --git a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/parser/TeamcityProjectParser.java b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/parser/TeamcityProjectParser.java similarity index 78% rename from teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/parser/TeamcityProjectParser.java rename to teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/parser/TeamcityProjectParser.java index 78c7765..fc64ec8 100644 --- a/teamcity/teamcity-core/src/main/java/org/sadtech/bot/vcs/teamcity/core/service/parser/TeamcityProjectParser.java +++ b/teamcity/teamcity-core/src/main/java/org/sadtech/bot/gitlab/teamcity/core/service/parser/TeamcityProjectParser.java @@ -1,12 +1,12 @@ -package org.sadtech.bot.vcs.teamcity.core.service.parser; +package org.sadtech.bot.gitlab.teamcity.core.service.parser; import lombok.RequiredArgsConstructor; -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.TeamcityProject; -import org.sadtech.bot.vcs.teamcity.core.service.TeamcityProjectService; -import org.sadtech.bot.vcs.teamcity.sdk.TeamcityProjectJson; -import org.sadtech.bot.vcs.teamcity.sdk.sheet.TeamcityProjectJsonSheet; +import org.sadtech.bot.gitlab.core.utils.Utils; +import org.sadtech.bot.gitlab.teamcity.core.config.property.TeamcityProperty; +import org.sadtech.bot.gitlab.teamcity.core.domain.entity.TeamcityProject; +import org.sadtech.bot.gitlab.teamcity.core.service.TeamcityProjectService; +import org.sadtech.bot.gitlab.teamcity.sdk.TeamcityProjectJson; +import org.sadtech.bot.gitlab.teamcity.sdk.sheet.TeamcityProjectJsonSheet; import org.springframework.core.convert.ConversionService; import org.springframework.stereotype.Component; diff --git a/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/BuildShortJson.java b/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/BuildShortJson.java similarity index 90% rename from teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/BuildShortJson.java rename to teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/BuildShortJson.java index cfa108d..29e1dc5 100644 --- a/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/BuildShortJson.java +++ b/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/BuildShortJson.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.teamcity.sdk; +package org.sadtech.bot.gitlab.teamcity.sdk; import lombok.Getter; import lombok.Setter; diff --git a/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/BuildState.java b/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/BuildState.java similarity index 83% rename from teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/BuildState.java rename to teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/BuildState.java index 6c3732c..90887fd 100644 --- a/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/BuildState.java +++ b/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/BuildState.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.teamcity.sdk; +package org.sadtech.bot.gitlab.teamcity.sdk; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/BuildStatus.java b/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/BuildStatus.java similarity index 77% rename from teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/BuildStatus.java rename to teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/BuildStatus.java index bd6ac43..b30ed92 100644 --- a/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/BuildStatus.java +++ b/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/BuildStatus.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.teamcity.sdk; +package org.sadtech.bot.gitlab.teamcity.sdk; /** * // TODO: 21.09.2020 Добавить описание. diff --git a/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/Sheet.java b/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/Sheet.java similarity index 86% rename from teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/Sheet.java rename to teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/Sheet.java index 16977fa..b31c52a 100644 --- a/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/Sheet.java +++ b/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/Sheet.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.teamcity.sdk; +package org.sadtech.bot.gitlab.teamcity.sdk; import lombok.Getter; import lombok.Setter; diff --git a/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/TeamcityProjectJson.java b/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/TeamcityProjectJson.java similarity index 87% rename from teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/TeamcityProjectJson.java rename to teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/TeamcityProjectJson.java index e862d52..5f105f5 100644 --- a/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/TeamcityProjectJson.java +++ b/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/TeamcityProjectJson.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.teamcity.sdk; +package org.sadtech.bot.gitlab.teamcity.sdk; import lombok.Getter; import lombok.Setter; diff --git a/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/sheet/BuildShortJsonSheet.java b/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/sheet/BuildShortJsonSheet.java similarity index 68% rename from teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/sheet/BuildShortJsonSheet.java rename to teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/sheet/BuildShortJsonSheet.java index 47575cd..a756ab6 100644 --- a/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/sheet/BuildShortJsonSheet.java +++ b/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/sheet/BuildShortJsonSheet.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vcs.teamcity.sdk.sheet; +package org.sadtech.bot.gitlab.teamcity.sdk.sheet; import lombok.Setter; -import org.sadtech.bot.vcs.teamcity.sdk.BuildShortJson; -import org.sadtech.bot.vcs.teamcity.sdk.Sheet; +import org.sadtech.bot.gitlab.teamcity.sdk.BuildShortJson; +import org.sadtech.bot.gitlab.teamcity.sdk.Sheet; import java.util.List; diff --git a/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/sheet/TeamcityProjectJsonSheet.java b/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/sheet/TeamcityProjectJsonSheet.java similarity index 69% rename from teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/sheet/TeamcityProjectJsonSheet.java rename to teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/sheet/TeamcityProjectJsonSheet.java index a452b52..d73ac3e 100644 --- a/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/vcs/teamcity/sdk/sheet/TeamcityProjectJsonSheet.java +++ b/teamcity/teamcity-sdk/src/main/java/org/sadtech/bot/gitlab/teamcity/sdk/sheet/TeamcityProjectJsonSheet.java @@ -1,8 +1,8 @@ -package org.sadtech.bot.vcs.teamcity.sdk.sheet; +package org.sadtech.bot.gitlab.teamcity.sdk.sheet; import lombok.Setter; -import org.sadtech.bot.vcs.teamcity.sdk.Sheet; -import org.sadtech.bot.vcs.teamcity.sdk.TeamcityProjectJson; +import org.sadtech.bot.gitlab.teamcity.sdk.Sheet; +import org.sadtech.bot.gitlab.teamcity.sdk.TeamcityProjectJson; import java.util.List; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/config/TelegramBotConfig.java b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/config/TelegramBotConfig.java similarity index 96% rename from telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/config/TelegramBotConfig.java rename to telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/config/TelegramBotConfig.java index 94b6895..26b39c2 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/config/TelegramBotConfig.java +++ b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/config/TelegramBotConfig.java @@ -1,14 +1,14 @@ -package org.sadtech.bot.vcs.telegram.config; +package org.sadtech.bot.gitlab.telegram.config; import org.sadtech.autoresponder.repository.UnitPointerRepository; import org.sadtech.autoresponder.repository.UnitPointerRepositoryMap; +import org.sadtech.bot.gitlab.telegram.service.ReplaceUrlLocalhost; import org.sadtech.bot.godfather.telegram.autoresponder.MessageAutoresponderTelegram; import org.sadtech.bot.godfather.telegram.config.TelegramPollingConfig; import org.sadtech.bot.godfather.telegram.listen.EventDistributor; import org.sadtech.bot.godfather.telegram.listen.EventDistributorImpl; import org.sadtech.bot.godfather.telegram.listen.TelegramConnect; import org.sadtech.bot.godfather.telegram.listen.TelegramSender; -import org.sadtech.bot.vcs.telegram.service.ReplaceUrlLocalhost; import org.sadtech.social.bot.domain.unit.AnswerCheck; import org.sadtech.social.core.domain.content.Mail; import org.sadtech.social.core.repository.impl.local.MailRepositoryList; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/scheduler/CheckNewMessage.java b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/scheduler/CheckNewMessage.java similarity index 90% rename from telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/scheduler/CheckNewMessage.java rename to telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/scheduler/CheckNewMessage.java index bfa98b5..fc3800f 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/scheduler/CheckNewMessage.java +++ b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/scheduler/CheckNewMessage.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.telegram.scheduler; +package org.sadtech.bot.gitlab.telegram.scheduler; import lombok.RequiredArgsConstructor; import org.sadtech.bot.godfather.telegram.autoresponder.MessageAutoresponderTelegram; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/MessageSendTelegramService.java b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/MessageSendTelegramService.java similarity index 76% rename from telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/MessageSendTelegramService.java rename to telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/MessageSendTelegramService.java index 70701cb..39d8a16 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/MessageSendTelegramService.java +++ b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/MessageSendTelegramService.java @@ -1,12 +1,12 @@ -package org.sadtech.bot.vcs.telegram.service; +package org.sadtech.bot.gitlab.telegram.service; import lombok.NonNull; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.notify.Notify; -import org.sadtech.bot.vsc.bitbucketbot.context.exception.NotFoundException; -import org.sadtech.bot.vsc.bitbucketbot.context.service.ChatService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.MessageSendService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PersonService; +import org.sadtech.bot.gitlab.context.domain.notify.Notify; +import org.sadtech.bot.gitlab.context.exception.NotFoundException; +import org.sadtech.bot.gitlab.context.service.ChatService; +import org.sadtech.bot.gitlab.context.service.MessageSendService; +import org.sadtech.bot.gitlab.context.service.PersonService; import org.sadtech.social.core.domain.BoxAnswer; import org.sadtech.social.core.service.sender.Sending; import org.springframework.stereotype.Service; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/ReplaceUrlLocalhost.java b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/ReplaceUrlLocalhost.java similarity index 89% rename from telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/ReplaceUrlLocalhost.java rename to telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/ReplaceUrlLocalhost.java index f8ca07e..e18f548 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/ReplaceUrlLocalhost.java +++ b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/ReplaceUrlLocalhost.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.telegram.service; +package org.sadtech.bot.gitlab.telegram.service; import org.sadtech.bot.godfather.telegram.service.SendPreProcessing; import org.springframework.stereotype.Component; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/unit/RatingTopProcessing.java b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/unit/RatingTopProcessing.java similarity index 73% rename from telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/unit/RatingTopProcessing.java rename to telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/unit/RatingTopProcessing.java index ccf1144..d795491 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/unit/RatingTopProcessing.java +++ b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/unit/RatingTopProcessing.java @@ -1,10 +1,10 @@ -package org.sadtech.bot.vcs.telegram.service.unit; +package org.sadtech.bot.gitlab.telegram.service.unit; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Person; -import org.sadtech.bot.vsc.bitbucketbot.context.exception.NotFoundException; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PersonService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.RatingService; +import org.sadtech.bot.gitlab.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.exception.NotFoundException; +import org.sadtech.bot.gitlab.context.service.PersonService; +import org.sadtech.bot.gitlab.context.service.RatingService; import org.sadtech.social.bot.service.usercode.ProcessingData; import org.sadtech.social.core.domain.BoxAnswer; import org.sadtech.social.core.domain.content.Message; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/unit/TaskProcessing.java b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/unit/TaskProcessing.java similarity index 77% rename from telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/unit/TaskProcessing.java rename to telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/unit/TaskProcessing.java index 864f37b..568d8bd 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/unit/TaskProcessing.java +++ b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/unit/TaskProcessing.java @@ -1,12 +1,12 @@ -package org.sadtech.bot.vcs.telegram.service.unit; +package org.sadtech.bot.gitlab.telegram.service.unit; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.TaskStatus; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Person; -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.PersonService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.TaskService; +import org.sadtech.bot.gitlab.context.domain.TaskStatus; +import org.sadtech.bot.gitlab.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.domain.entity.Task; +import org.sadtech.bot.gitlab.context.exception.NotFoundException; +import org.sadtech.bot.gitlab.context.service.PersonService; +import org.sadtech.bot.gitlab.context.service.TaskService; import org.sadtech.social.bot.service.usercode.ProcessingData; import org.sadtech.social.core.domain.BoxAnswer; import org.sadtech.social.core.domain.content.Message; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/unit/pullrequest/PullRequestNeedWorkProcessing.java b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/unit/pullrequest/PullRequestNeedWorkProcessing.java similarity index 72% rename from telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/unit/pullrequest/PullRequestNeedWorkProcessing.java rename to telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/unit/pullrequest/PullRequestNeedWorkProcessing.java index fd0461b..3052669 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/unit/pullrequest/PullRequestNeedWorkProcessing.java +++ b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/unit/pullrequest/PullRequestNeedWorkProcessing.java @@ -1,12 +1,12 @@ -package org.sadtech.bot.vcs.telegram.service.unit.pullrequest; +package org.sadtech.bot.gitlab.telegram.service.unit.pullrequest; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Person; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequest; -import org.sadtech.bot.vsc.bitbucketbot.context.exception.NotFoundException; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PersonService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PullRequestsService; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.MessageUtils; +import org.sadtech.bot.gitlab.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.context.exception.NotFoundException; +import org.sadtech.bot.gitlab.context.service.PersonService; +import org.sadtech.bot.gitlab.context.service.PullRequestsService; +import org.sadtech.bot.gitlab.context.utils.MessageUtils; import org.sadtech.bot.vsc.context.domain.ReviewerStatus; import org.sadtech.social.bot.service.usercode.ProcessingData; import org.sadtech.social.core.domain.BoxAnswer; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/unit/pullrequest/PullRequestReviewProcessing.java b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/unit/pullrequest/PullRequestReviewProcessing.java similarity index 74% rename from telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/unit/pullrequest/PullRequestReviewProcessing.java rename to telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/unit/pullrequest/PullRequestReviewProcessing.java index f58c69a..0a82b8e 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/unit/pullrequest/PullRequestReviewProcessing.java +++ b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/service/unit/pullrequest/PullRequestReviewProcessing.java @@ -1,12 +1,12 @@ -package org.sadtech.bot.vcs.telegram.service.unit.pullrequest; +package org.sadtech.bot.gitlab.telegram.service.unit.pullrequest; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Person; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.PullRequest; -import org.sadtech.bot.vsc.bitbucketbot.context.exception.NotFoundException; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PersonService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PullRequestsService; -import org.sadtech.bot.vsc.bitbucketbot.context.utils.MessageUtils; +import org.sadtech.bot.gitlab.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.domain.entity.PullRequest; +import org.sadtech.bot.gitlab.context.exception.NotFoundException; +import org.sadtech.bot.gitlab.context.service.PersonService; +import org.sadtech.bot.gitlab.context.service.PullRequestsService; +import org.sadtech.bot.gitlab.context.utils.MessageUtils; import org.sadtech.bot.vsc.context.domain.PullRequestStatus; import org.sadtech.bot.vsc.context.domain.ReviewerStatus; import org.sadtech.social.bot.service.usercode.ProcessingData; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/unit/NotifySettingUnit.java b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/unit/NotifySettingUnit.java similarity index 90% rename from telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/unit/NotifySettingUnit.java rename to telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/unit/NotifySettingUnit.java index 54d9dc7..9f836fc 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/unit/NotifySettingUnit.java +++ b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/unit/NotifySettingUnit.java @@ -1,13 +1,13 @@ -package org.sadtech.bot.vcs.telegram.unit; +package org.sadtech.bot.gitlab.telegram.unit; import lombok.Getter; import lombok.NonNull; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.NotifySetting; -import org.sadtech.bot.vsc.bitbucketbot.context.domain.entity.Person; -import org.sadtech.bot.vsc.bitbucketbot.context.exception.NotFoundException; -import org.sadtech.bot.vsc.bitbucketbot.context.service.NotifyService; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PersonService; +import org.sadtech.bot.gitlab.context.domain.entity.NotifySetting; +import org.sadtech.bot.gitlab.context.domain.entity.Person; +import org.sadtech.bot.gitlab.context.exception.NotFoundException; +import org.sadtech.bot.gitlab.context.service.NotifyService; +import org.sadtech.bot.gitlab.context.service.PersonService; import org.sadtech.social.bot.domain.unit.AnswerProcessing; import org.sadtech.social.bot.domain.unit.AnswerText; import org.sadtech.social.core.domain.BoxAnswer; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/unit/PullRequestUnitConfig.java b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/unit/PullRequestUnitConfig.java similarity index 90% rename from telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/unit/PullRequestUnitConfig.java rename to telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/unit/PullRequestUnitConfig.java index e6acb6f..deb568b 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/unit/PullRequestUnitConfig.java +++ b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/unit/PullRequestUnitConfig.java @@ -1,7 +1,7 @@ -package org.sadtech.bot.vcs.telegram.unit; +package org.sadtech.bot.gitlab.telegram.unit; -import org.sadtech.bot.vcs.telegram.service.unit.pullrequest.PullRequestNeedWorkProcessing; -import org.sadtech.bot.vcs.telegram.service.unit.pullrequest.PullRequestReviewProcessing; +import org.sadtech.bot.gitlab.telegram.service.unit.pullrequest.PullRequestNeedWorkProcessing; +import org.sadtech.bot.gitlab.telegram.service.unit.pullrequest.PullRequestReviewProcessing; import org.sadtech.social.bot.domain.unit.AnswerProcessing; import org.sadtech.social.bot.domain.unit.AnswerText; import org.sadtech.social.core.domain.BoxAnswer; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/unit/UnitConfig.java b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/unit/UnitConfig.java similarity index 93% rename from telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/unit/UnitConfig.java rename to telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/unit/UnitConfig.java index 9a96d35..34b4cb8 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/unit/UnitConfig.java +++ b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/unit/UnitConfig.java @@ -1,10 +1,10 @@ -package org.sadtech.bot.vcs.telegram.unit; +package org.sadtech.bot.gitlab.telegram.unit; import lombok.RequiredArgsConstructor; -import org.sadtech.bot.vcs.telegram.service.unit.RatingTopProcessing; -import org.sadtech.bot.vcs.telegram.service.unit.TaskProcessing; -import org.sadtech.bot.vcs.telegram.utils.GeneratorKeyBoards; -import org.sadtech.bot.vsc.bitbucketbot.context.service.PersonService; +import org.sadtech.bot.gitlab.context.service.PersonService; +import org.sadtech.bot.gitlab.telegram.service.unit.RatingTopProcessing; +import org.sadtech.bot.gitlab.telegram.service.unit.TaskProcessing; +import org.sadtech.bot.gitlab.telegram.utils.GeneratorKeyBoards; import org.sadtech.social.bot.domain.unit.AnswerCheck; import org.sadtech.social.bot.domain.unit.AnswerProcessing; import org.sadtech.social.bot.domain.unit.AnswerText; diff --git a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/utils/GeneratorKeyBoards.java b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/utils/GeneratorKeyBoards.java similarity index 97% rename from telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/utils/GeneratorKeyBoards.java rename to telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/utils/GeneratorKeyBoards.java index 45f3cfb..986e256 100644 --- a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/utils/GeneratorKeyBoards.java +++ b/telegram-bot/src/main/java/org/sadtech/bot/gitlab/telegram/utils/GeneratorKeyBoards.java @@ -1,4 +1,4 @@ -package org.sadtech.bot.vcs.telegram.utils; +package org.sadtech.bot.gitlab.telegram.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor;