Telegram-Bots/gitlab-notification
4
1
Fork 0
Code Issues 21 Pull Requests 1 Packages Projects 2 Releases 1 Activity

rename package

Browse Source
This commit is contained in:
uPagge 2021-01-13 20:55:10 +03:00
parent 4e25adba5b
commit 9c97344bf5
No known key found for this signature in database
GPG Key ID: 964B40928E4C9088
176 changed files with 567 additions and 570 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/AbstractPullRequestBitbucketParser.java
View File

@ -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;

8
bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/CommentJsonToComment.java
View File

@ -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;

12
bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/CommentJsonToTaskConvert.java
View File

@ -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;

18
bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/PullRequestJsonConverter.java
View File

@ -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;

4
bitbucketbot-core/src/main/java/org/sadtech/bot/vcs/bitbucket/core/service/converter/UserJsonConverter.java
View File

@ -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;

2
bot-app/pom.xml
View File

@ -47,7 +47,7 @@
<dependency>
<groupId>org.sadtech.bot.gitlab</groupId>
<artifactId>bot-core</artifactId>
<artifactId>gitlab-core</artifactId>
</dependency>
<dependency>

12
bot-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/scheduler/RatingScheduler.java
View File

@ -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;

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

@ -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;

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

@ -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;

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

@ -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

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

@ -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;

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

@ -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;

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

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/Answer.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/Answer.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/EntityType.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/EntityType.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.vsc.bitbucketbot.context.domain;
package org.sadtech.bot.gitlab.context.domain;
/**
* // TODO: 21.09.2020 Добавить описание.

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/IdAndStatusPr.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/IdAndStatusPr.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/MessageSend.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/MessageSend.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/PointType.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/PointType.java
View File

@ -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;

8
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/TaskStatus.java Normal file
View File

@ -0,0 +1,8 @@
package org.sadtech.bot.gitlab.context.domain;
public enum TaskStatus {
OPEN,
RESOLVED
}

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Chat.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Chat.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Comment.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Comment.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/NotifySetting.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/NotifySetting.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Person.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Person.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/PullRequest.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/PullRequest.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/PullRequestMini.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/PullRequestMini.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/RatingHistory.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/RatingHistory.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/RatingList.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/RatingList.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Reviewer.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Reviewer.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/entity/Task.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Task.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/filter/PullRequestFilter.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/filter/PullRequestFilter.java
View File

@ -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;

12
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/GoodMorningNotify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/GoodMorningNotify.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/Notify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/Notify.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/SimpleTextNotify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/SimpleTextNotify.java
View File

@ -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;

10
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/AnswerCommentNotify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/comment/AnswerCommentNotify.java
View File

@ -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;

8
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/comment/CommentNotify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/comment/CommentNotify.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/ConflictPrNotify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/ConflictPrNotify.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/ForgottenSmartPrNotify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/ForgottenSmartPrNotify.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/NewPrNotify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/NewPrNotify.java
View File

@ -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;

6
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/PrNotify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/PrNotify.java
View File

@ -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;

12
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/ReviewersPrNotify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/ReviewersPrNotify.java
View File

@ -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 {

6
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/SmartPrNotify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/SmartPrNotify.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/StatusPrNotify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/StatusPrNotify.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/pullrequest/UpdatePrNotify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/UpdatePrNotify.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/task/TaskCloseNotify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/task/TaskCloseNotify.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/task/TaskNewNotify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/task/TaskNewNotify.java
View File

@ -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;

6
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/notify/task/TaskNotify.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/task/TaskNotify.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/util/ReviewerChange.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/util/ReviewerChange.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/BitbucketBotException.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/BitbucketBotException.java
View File

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

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/NotFoundException.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/NotFoundException.java
View File

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

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/RegException.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/RegException.java
View File

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

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/exception/UpdateException.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/UpdateException.java
View File

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

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/ChatRepository.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/ChatRepository.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/CommentRepository.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/CommentRepository.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/NotifySettingRepository.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/NotifySettingRepository.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/PersonRepository.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/PersonRepository.java
View File

@ -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;

8
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/PullRequestsRepository.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/PullRequestsRepository.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingHistoryRepository.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/RatingHistoryRepository.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/RatingListRepository.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/RatingListRepository.java
View File

@ -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;

6
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/repository/TaskRepository.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/TaskRepository.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/ChatService.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/ChatService.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.vsc.bitbucketbot.context.service;
package org.sadtech.bot.gitlab.context.service;
import lombok.NonNull;

6
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/CommentService.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/CommentService.java
View File

@ -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;

11
bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/MessageSendService.java Normal file
View File

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

6
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/NotifyService.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/NotifyService.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PersonService.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/PersonService.java
View File

@ -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;

10
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PullRequestsService.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/PullRequestsService.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/RatingService.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/RatingService.java
View File

@ -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 Добавить описание.

8
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/TaskService.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/TaskService.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/parser/PersonParser.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/parser/PersonParser.java
View File

@ -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 Добавить описание.

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/MessageUtils.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/utils/MessageUtils.java
View File

@ -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;

2
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/Smile.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/utils/Smile.java
View File

@ -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;

4
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/utils/UpdateDataComparator.java → bot-context/src/main/java/org/sadtech/bot/gitlab/context/utils/UpdateDataComparator.java
View File

@ -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;

8
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/domain/TaskStatus.java
View File

@ -1,8 +0,0 @@
package org.sadtech.bot.vsc.bitbucketbot.context.domain;
public enum TaskStatus {
OPEN,
RESOLVED
}

11
bot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/MessageSendService.java
View File

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

2
bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/AppProperty.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/AppProperty.java
View File

@ -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;

2
bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/BitbucketProperty.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/BitbucketProperty.java
View File

@ -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;

2
bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/InitProperty.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/InitProperty.java
View File

@ -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;

2
bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/RatingProperty.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/RatingProperty.java
View File

@ -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;

22
bot-core/src/main/java/org/sadtech/bot/vcs/core/scheduler/NotificationScheduler.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/scheduler/NotificationScheduler.java
View File

@ -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;

8
bot-core/src/main/java/org/sadtech/bot/vcs/core/service/converter/CommentToTaskConvert.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/converter/CommentToTaskConvert.java
View File

@ -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;

6
bot-core/src/main/java/org/sadtech/bot/vcs/core/service/converter/TaskToCommentConvert.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/converter/TaskToCommentConvert.java
View File

@ -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;

6
bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/ChatServiceImpl.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/ChatServiceImpl.java
View File

@ -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;

26
bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/CommentServiceImpl.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/CommentServiceImpl.java
View File

@ -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;

14
bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/NotifyServiceImpl.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/NotifyServiceImpl.java
View File

@ -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;

18
bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/PersonServiceImpl.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/PersonServiceImpl.java
View File

@ -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;

47
bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/PullRequestsServiceImpl.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/PullRequestsServiceImpl.java
View File

@ -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<PullRe
return pullRequestsRepository.findFirst(
CriteriaFilter.create().and(
CriteriaQuery.create()
.matchPhrase(PullRequest_.BITBUCKET_ID, pullRequest.getBitbucketId())
.matchPhrase(PullRequest_.REPOSITORY_ID, pullRequest.getRepositoryId())
.matchPhrase("hyita", pullRequest.getBitbucketId())
.matchPhrase("hyita", pullRequest.getRepositoryId())
)
).orElseThrow(() -> new UpdateException("ПР с таким id не существует"));
}

22
bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/RatingServiceImpl.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/RatingServiceImpl.java
View File

@ -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;

36
bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/TaskServiceImpl.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/TaskServiceImpl.java
View File

@ -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;

13
bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/filter/PullRequestFilterService.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/filter/PullRequestFilterService.java
View File

@ -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 AbstractFilterService<PullRequest,
private FilterQuery convertFilter(@NonNull PullRequestFilter filter) {
return CriteriaQuery.<PullRequest>create()
.matchPhrase(PullRequest_.BITBUCKET_ID, filter.getBitbucketId())
.matchPhrase(PullRequest_.REPOSITORY_ID, filter.getBitbucketRepositoryId());
.matchPhrase("hyita", filter.getBitbucketId())
.matchPhrase("hyita", filter.getBitbucketRepositoryId());
}
}

2
bot-core/src/main/java/org/sadtech/bot/vcs/core/utils/Pair.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/utils/Pair.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.vcs.core.utils;
package org.sadtech.bot.gitlab.core.utils;
import lombok.AllArgsConstructor;
import lombok.Data;

2
bot-core/src/main/java/org/sadtech/bot/vcs/core/utils/StringUtils.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/utils/StringUtils.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.vcs.core.utils;
package org.sadtech.bot.gitlab.core.utils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

2
bot-core/src/main/java/org/sadtech/bot/vcs/core/utils/Utils.java → bot-core/src/main/java/org/sadtech/bot/gitlab/core/utils/Utils.java
View File

@ -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;

8
bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/ChatRepositoryImpl.java → bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/ChatRepositoryImpl.java
View File

@ -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;

8
bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/CommentRepositoryImpl.java → bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/CommentRepositoryImpl.java
View File

@ -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;

8
bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/NotifySettingRepositoryImpl.java → bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/NotifySettingRepositoryImpl.java
View File

@ -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;

8
bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/PersonRepositoryImpl.java → bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/PersonRepositoryImpl.java
View File

@ -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;

14
bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/PullRequestsRepositoryImpl.java → bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/PullRequestsRepositoryImpl.java
View File

@ -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;

8
bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingHistoryRepositoryImpl.java → bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/RatingHistoryRepositoryImpl.java
View File

@ -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;

8
bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/RatingListRepositoryImpl.java → bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/RatingListRepositoryImpl.java
View File

@ -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;

10
bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/impl/TaskRepositoryImpl.java → bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/TaskRepositoryImpl.java
View File

@ -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;

4
bot-data/src/main/java/org/sadtech/bot/vcs/bitbucketbot/data/jpa/ChatJpaRepository.java → bot-data/src/main/java/org/sadtech/bot/gitlab/data/jpa/ChatJpaRepository.java
View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More