From c06554a42b9399809c2724608cffc2f0dfd893ac Mon Sep 17 00:00:00 2001 From: upagge Date: Sun, 1 Mar 2020 15:51:12 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bitbucketbot/{ => dto}/bitbucket/FromRefJson.java | 2 +- .../tsc/bitbucketbot/{ => dto}/bitbucket/LinkJson.java | 2 +- .../{ => dto}/bitbucket/PullRequestJson.java | 2 +- .../{ => dto}/bitbucket/PullRequestState.java | 2 +- .../{ => dto}/bitbucket/RepositoryJson.java | 2 +- .../tsc/bitbucketbot/{ => dto}/bitbucket/SelfJson.java | 2 +- .../tsc/bitbucketbot/{ => dto}/bitbucket/Sheet.java | 2 +- .../{ => dto}/bitbucket/UserDecisionJson.java | 2 +- .../tsc/bitbucketbot/{ => dto}/bitbucket/UserJson.java | 2 +- .../{ => dto}/bitbucket/UserPullRequestStatus.java | 2 +- .../bitbucket/sheet/PullRequestSheetJson.java | 6 +++--- .../{ => dto}/bitbucket/sheet/UserSheetJson.java | 6 +++--- .../tsc/bitbucketbot/scheduler/SchedulerNewUser.java | 5 ++--- .../bitbucketbot/scheduler/SchedulerPullRequest.java | 4 ++-- .../service/converter/PullRequestJsonConverter.java | 10 +++++----- .../service/converter/UserJsonConverter.java | 2 +- .../tsc/bitbucketbot/service/impl/UserServiceImpl.java | 2 +- 17 files changed, 27 insertions(+), 28 deletions(-) rename src/main/java/com/tsc/bitbucketbot/{ => dto}/bitbucket/FromRefJson.java (81%) rename src/main/java/com/tsc/bitbucketbot/{ => dto}/bitbucket/LinkJson.java (82%) rename src/main/java/com/tsc/bitbucketbot/{ => dto}/bitbucket/PullRequestJson.java (91%) rename src/main/java/com/tsc/bitbucketbot/{ => dto}/bitbucket/PullRequestState.java (79%) rename src/main/java/com/tsc/bitbucketbot/{ => dto}/bitbucket/RepositoryJson.java (80%) rename src/main/java/com/tsc/bitbucketbot/{ => dto}/bitbucket/SelfJson.java (80%) rename src/main/java/com/tsc/bitbucketbot/{ => dto}/bitbucket/Sheet.java (88%) rename src/main/java/com/tsc/bitbucketbot/{ => dto}/bitbucket/UserDecisionJson.java (88%) rename src/main/java/com/tsc/bitbucketbot/{ => dto}/bitbucket/UserJson.java (82%) rename src/main/java/com/tsc/bitbucketbot/{ => dto}/bitbucket/UserPullRequestStatus.java (80%) rename src/main/java/com/tsc/bitbucketbot/{ => dto}/bitbucket/sheet/PullRequestSheetJson.java (51%) rename src/main/java/com/tsc/bitbucketbot/{ => dto}/bitbucket/sheet/UserSheetJson.java (50%) diff --git a/src/main/java/com/tsc/bitbucketbot/bitbucket/FromRefJson.java b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/FromRefJson.java similarity index 81% rename from src/main/java/com/tsc/bitbucketbot/bitbucket/FromRefJson.java rename to src/main/java/com/tsc/bitbucketbot/dto/bitbucket/FromRefJson.java index 100dc33..433c8f6 100644 --- a/src/main/java/com/tsc/bitbucketbot/bitbucket/FromRefJson.java +++ b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/FromRefJson.java @@ -1,4 +1,4 @@ -package com.tsc.bitbucketbot.bitbucket; +package com.tsc.bitbucketbot.dto.bitbucket; import lombok.Data; diff --git a/src/main/java/com/tsc/bitbucketbot/bitbucket/LinkJson.java b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/LinkJson.java similarity index 82% rename from src/main/java/com/tsc/bitbucketbot/bitbucket/LinkJson.java rename to src/main/java/com/tsc/bitbucketbot/dto/bitbucket/LinkJson.java index b96177d..e082a60 100644 --- a/src/main/java/com/tsc/bitbucketbot/bitbucket/LinkJson.java +++ b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/LinkJson.java @@ -1,4 +1,4 @@ -package com.tsc.bitbucketbot.bitbucket; +package com.tsc.bitbucketbot.dto.bitbucket; import lombok.Data; diff --git a/src/main/java/com/tsc/bitbucketbot/bitbucket/PullRequestJson.java b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/PullRequestJson.java similarity index 91% rename from src/main/java/com/tsc/bitbucketbot/bitbucket/PullRequestJson.java rename to src/main/java/com/tsc/bitbucketbot/dto/bitbucket/PullRequestJson.java index 5798a65..d91e773 100644 --- a/src/main/java/com/tsc/bitbucketbot/bitbucket/PullRequestJson.java +++ b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/PullRequestJson.java @@ -1,4 +1,4 @@ -package com.tsc.bitbucketbot.bitbucket; +package com.tsc.bitbucketbot.dto.bitbucket; import lombok.Data; diff --git a/src/main/java/com/tsc/bitbucketbot/bitbucket/PullRequestState.java b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/PullRequestState.java similarity index 79% rename from src/main/java/com/tsc/bitbucketbot/bitbucket/PullRequestState.java rename to src/main/java/com/tsc/bitbucketbot/dto/bitbucket/PullRequestState.java index 0ad1a99..a1d37c7 100644 --- a/src/main/java/com/tsc/bitbucketbot/bitbucket/PullRequestState.java +++ b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/PullRequestState.java @@ -1,4 +1,4 @@ -package com.tsc.bitbucketbot.bitbucket; +package com.tsc.bitbucketbot.dto.bitbucket; /** * TODO: Добавить комментарий енума. diff --git a/src/main/java/com/tsc/bitbucketbot/bitbucket/RepositoryJson.java b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/RepositoryJson.java similarity index 80% rename from src/main/java/com/tsc/bitbucketbot/bitbucket/RepositoryJson.java rename to src/main/java/com/tsc/bitbucketbot/dto/bitbucket/RepositoryJson.java index 1e2dc90..1f81498 100644 --- a/src/main/java/com/tsc/bitbucketbot/bitbucket/RepositoryJson.java +++ b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/RepositoryJson.java @@ -1,4 +1,4 @@ -package com.tsc.bitbucketbot.bitbucket; +package com.tsc.bitbucketbot.dto.bitbucket; import lombok.Data; diff --git a/src/main/java/com/tsc/bitbucketbot/bitbucket/SelfJson.java b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/SelfJson.java similarity index 80% rename from src/main/java/com/tsc/bitbucketbot/bitbucket/SelfJson.java rename to src/main/java/com/tsc/bitbucketbot/dto/bitbucket/SelfJson.java index 2042bfe..1bfc845 100644 --- a/src/main/java/com/tsc/bitbucketbot/bitbucket/SelfJson.java +++ b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/SelfJson.java @@ -1,4 +1,4 @@ -package com.tsc.bitbucketbot.bitbucket; +package com.tsc.bitbucketbot.dto.bitbucket; import lombok.Data; diff --git a/src/main/java/com/tsc/bitbucketbot/bitbucket/Sheet.java b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/Sheet.java similarity index 88% rename from src/main/java/com/tsc/bitbucketbot/bitbucket/Sheet.java rename to src/main/java/com/tsc/bitbucketbot/dto/bitbucket/Sheet.java index 95e7332..f440ca4 100644 --- a/src/main/java/com/tsc/bitbucketbot/bitbucket/Sheet.java +++ b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/Sheet.java @@ -1,4 +1,4 @@ -package com.tsc.bitbucketbot.bitbucket; +package com.tsc.bitbucketbot.dto.bitbucket; import lombok.Data; diff --git a/src/main/java/com/tsc/bitbucketbot/bitbucket/UserDecisionJson.java b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/UserDecisionJson.java similarity index 88% rename from src/main/java/com/tsc/bitbucketbot/bitbucket/UserDecisionJson.java rename to src/main/java/com/tsc/bitbucketbot/dto/bitbucket/UserDecisionJson.java index 8cda3c9..c6c243b 100644 --- a/src/main/java/com/tsc/bitbucketbot/bitbucket/UserDecisionJson.java +++ b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/UserDecisionJson.java @@ -1,4 +1,4 @@ -package com.tsc.bitbucketbot.bitbucket; +package com.tsc.bitbucketbot.dto.bitbucket; import com.tsc.bitbucketbot.domain.BitbucketUserRole; import lombok.Data; diff --git a/src/main/java/com/tsc/bitbucketbot/bitbucket/UserJson.java b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/UserJson.java similarity index 82% rename from src/main/java/com/tsc/bitbucketbot/bitbucket/UserJson.java rename to src/main/java/com/tsc/bitbucketbot/dto/bitbucket/UserJson.java index 6324c18..2ab6f25 100644 --- a/src/main/java/com/tsc/bitbucketbot/bitbucket/UserJson.java +++ b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/UserJson.java @@ -1,4 +1,4 @@ -package com.tsc.bitbucketbot.bitbucket; +package com.tsc.bitbucketbot.dto.bitbucket; import lombok.Data; diff --git a/src/main/java/com/tsc/bitbucketbot/bitbucket/UserPullRequestStatus.java b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/UserPullRequestStatus.java similarity index 80% rename from src/main/java/com/tsc/bitbucketbot/bitbucket/UserPullRequestStatus.java rename to src/main/java/com/tsc/bitbucketbot/dto/bitbucket/UserPullRequestStatus.java index 2abb179..dfff7c7 100644 --- a/src/main/java/com/tsc/bitbucketbot/bitbucket/UserPullRequestStatus.java +++ b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/UserPullRequestStatus.java @@ -1,4 +1,4 @@ -package com.tsc.bitbucketbot.bitbucket; +package com.tsc.bitbucketbot.dto.bitbucket; /** * TODO: Добавить комментарий енума. diff --git a/src/main/java/com/tsc/bitbucketbot/bitbucket/sheet/PullRequestSheetJson.java b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/sheet/PullRequestSheetJson.java similarity index 51% rename from src/main/java/com/tsc/bitbucketbot/bitbucket/sheet/PullRequestSheetJson.java rename to src/main/java/com/tsc/bitbucketbot/dto/bitbucket/sheet/PullRequestSheetJson.java index 32ba942..81b1f96 100644 --- a/src/main/java/com/tsc/bitbucketbot/bitbucket/sheet/PullRequestSheetJson.java +++ b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/sheet/PullRequestSheetJson.java @@ -1,7 +1,7 @@ -package com.tsc.bitbucketbot.bitbucket.sheet; +package com.tsc.bitbucketbot.dto.bitbucket.sheet; -import com.tsc.bitbucketbot.bitbucket.PullRequestJson; -import com.tsc.bitbucketbot.bitbucket.Sheet; +import com.tsc.bitbucketbot.dto.bitbucket.PullRequestJson; +import com.tsc.bitbucketbot.dto.bitbucket.Sheet; /** * TODO: Добавить описание класса. diff --git a/src/main/java/com/tsc/bitbucketbot/bitbucket/sheet/UserSheetJson.java b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/sheet/UserSheetJson.java similarity index 50% rename from src/main/java/com/tsc/bitbucketbot/bitbucket/sheet/UserSheetJson.java rename to src/main/java/com/tsc/bitbucketbot/dto/bitbucket/sheet/UserSheetJson.java index dc3060c..35bb926 100644 --- a/src/main/java/com/tsc/bitbucketbot/bitbucket/sheet/UserSheetJson.java +++ b/src/main/java/com/tsc/bitbucketbot/dto/bitbucket/sheet/UserSheetJson.java @@ -1,7 +1,7 @@ -package com.tsc.bitbucketbot.bitbucket.sheet; +package com.tsc.bitbucketbot.dto.bitbucket.sheet; -import com.tsc.bitbucketbot.bitbucket.Sheet; -import com.tsc.bitbucketbot.bitbucket.UserJson; +import com.tsc.bitbucketbot.dto.bitbucket.Sheet; +import com.tsc.bitbucketbot.dto.bitbucket.UserJson; /** * TODO: Добавить описание класса. diff --git a/src/main/java/com/tsc/bitbucketbot/scheduler/SchedulerNewUser.java b/src/main/java/com/tsc/bitbucketbot/scheduler/SchedulerNewUser.java index 19bd06e..ddf1800 100644 --- a/src/main/java/com/tsc/bitbucketbot/scheduler/SchedulerNewUser.java +++ b/src/main/java/com/tsc/bitbucketbot/scheduler/SchedulerNewUser.java @@ -1,10 +1,9 @@ package com.tsc.bitbucketbot.scheduler; -import com.tsc.bitbucketbot.bitbucket.Sheet; -import com.tsc.bitbucketbot.bitbucket.UserJson; -import com.tsc.bitbucketbot.bitbucket.sheet.UserSheetJson; import com.tsc.bitbucketbot.config.BitbucketConfig; import com.tsc.bitbucketbot.domain.entity.User; +import com.tsc.bitbucketbot.dto.bitbucket.UserJson; +import com.tsc.bitbucketbot.dto.bitbucket.sheet.UserSheetJson; import com.tsc.bitbucketbot.service.UserService; import com.tsc.bitbucketbot.service.Utils; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/tsc/bitbucketbot/scheduler/SchedulerPullRequest.java b/src/main/java/com/tsc/bitbucketbot/scheduler/SchedulerPullRequest.java index e0f65b1..ea11c12 100644 --- a/src/main/java/com/tsc/bitbucketbot/scheduler/SchedulerPullRequest.java +++ b/src/main/java/com/tsc/bitbucketbot/scheduler/SchedulerPullRequest.java @@ -1,7 +1,5 @@ package com.tsc.bitbucketbot.scheduler; -import com.tsc.bitbucketbot.bitbucket.PullRequestJson; -import com.tsc.bitbucketbot.bitbucket.sheet.PullRequestSheetJson; import com.tsc.bitbucketbot.config.BitbucketConfig; import com.tsc.bitbucketbot.domain.MessageSend; import com.tsc.bitbucketbot.domain.PullRequestStatus; @@ -10,6 +8,8 @@ import com.tsc.bitbucketbot.domain.entity.PullRequest; import com.tsc.bitbucketbot.domain.entity.Reviewer; import com.tsc.bitbucketbot.domain.entity.User; import com.tsc.bitbucketbot.domain.util.ReviewerChange; +import com.tsc.bitbucketbot.dto.bitbucket.PullRequestJson; +import com.tsc.bitbucketbot.dto.bitbucket.sheet.PullRequestSheetJson; import com.tsc.bitbucketbot.service.MessageSendService; import com.tsc.bitbucketbot.service.PullRequestsService; import com.tsc.bitbucketbot.service.UserService; diff --git a/src/main/java/com/tsc/bitbucketbot/service/converter/PullRequestJsonConverter.java b/src/main/java/com/tsc/bitbucketbot/service/converter/PullRequestJsonConverter.java index 4940828..9f680c6 100644 --- a/src/main/java/com/tsc/bitbucketbot/service/converter/PullRequestJsonConverter.java +++ b/src/main/java/com/tsc/bitbucketbot/service/converter/PullRequestJsonConverter.java @@ -1,15 +1,15 @@ package com.tsc.bitbucketbot.service.converter; -import com.tsc.bitbucketbot.bitbucket.PullRequestJson; -import com.tsc.bitbucketbot.bitbucket.PullRequestState; -import com.tsc.bitbucketbot.bitbucket.UserDecisionJson; -import com.tsc.bitbucketbot.bitbucket.UserJson; -import com.tsc.bitbucketbot.bitbucket.UserPullRequestStatus; import com.tsc.bitbucketbot.domain.PullRequestStatus; import com.tsc.bitbucketbot.domain.ReviewerStatus; import com.tsc.bitbucketbot.domain.entity.PullRequest; import com.tsc.bitbucketbot.domain.entity.Reviewer; import com.tsc.bitbucketbot.domain.entity.User; +import com.tsc.bitbucketbot.dto.bitbucket.PullRequestJson; +import com.tsc.bitbucketbot.dto.bitbucket.PullRequestState; +import com.tsc.bitbucketbot.dto.bitbucket.UserDecisionJson; +import com.tsc.bitbucketbot.dto.bitbucket.UserJson; +import com.tsc.bitbucketbot.dto.bitbucket.UserPullRequestStatus; import com.tsc.bitbucketbot.service.UserService; import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; diff --git a/src/main/java/com/tsc/bitbucketbot/service/converter/UserJsonConverter.java b/src/main/java/com/tsc/bitbucketbot/service/converter/UserJsonConverter.java index 1ee9b08..48e11a2 100644 --- a/src/main/java/com/tsc/bitbucketbot/service/converter/UserJsonConverter.java +++ b/src/main/java/com/tsc/bitbucketbot/service/converter/UserJsonConverter.java @@ -1,7 +1,7 @@ package com.tsc.bitbucketbot.service.converter; -import com.tsc.bitbucketbot.bitbucket.UserJson; import com.tsc.bitbucketbot.domain.entity.User; +import com.tsc.bitbucketbot.dto.bitbucket.UserJson; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/tsc/bitbucketbot/service/impl/UserServiceImpl.java b/src/main/java/com/tsc/bitbucketbot/service/impl/UserServiceImpl.java index 719e4c4..4c8ea18 100644 --- a/src/main/java/com/tsc/bitbucketbot/service/impl/UserServiceImpl.java +++ b/src/main/java/com/tsc/bitbucketbot/service/impl/UserServiceImpl.java @@ -1,8 +1,8 @@ package com.tsc.bitbucketbot.service.impl; -import com.tsc.bitbucketbot.bitbucket.sheet.PullRequestSheetJson; import com.tsc.bitbucketbot.config.BitbucketConfig; import com.tsc.bitbucketbot.domain.entity.User; +import com.tsc.bitbucketbot.dto.bitbucket.sheet.PullRequestSheetJson; import com.tsc.bitbucketbot.exception.RegException; import com.tsc.bitbucketbot.repository.jpa.UserRepository; import com.tsc.bitbucketbot.service.UserService;