diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/ConflictPrNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/ConflictPrNotify.java similarity index 91% rename from bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/ConflictPrNotify.java rename to bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/ConflictPrNotify.java index 4dae705..5132563 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/ConflictPrNotify.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/ConflictPrNotify.java @@ -1,4 +1,4 @@ -package dev.struchkov.bot.gitlab.context.domain.notify.pullrequest; +package dev.struchkov.bot.gitlab.context.domain.notify.mergerequest; import dev.struchkov.bot.gitlab.context.utils.Smile; import lombok.Builder; diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/ForgottenSmartPrNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/ForgottenSmartPrNotify.java similarity index 92% rename from bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/ForgottenSmartPrNotify.java rename to bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/ForgottenSmartPrNotify.java index a45a6c9..805d7ed 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/ForgottenSmartPrNotify.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/ForgottenSmartPrNotify.java @@ -1,4 +1,4 @@ -package dev.struchkov.bot.gitlab.context.domain.notify.pullrequest; +package dev.struchkov.bot.gitlab.context.domain.notify.mergerequest; import dev.struchkov.bot.gitlab.context.utils.Smile; import lombok.Builder; diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/NewPrNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/NewPrNotify.java similarity index 96% rename from bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/NewPrNotify.java rename to bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/NewPrNotify.java index 2c14d94..f8c0ca3 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/NewPrNotify.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/NewPrNotify.java @@ -1,4 +1,4 @@ -package dev.struchkov.bot.gitlab.context.domain.notify.pullrequest; +package dev.struchkov.bot.gitlab.context.domain.notify.mergerequest; import dev.struchkov.bot.gitlab.context.utils.Smile; import dev.struchkov.haiti.utils.Strings; diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/PrNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/PrNotify.java similarity index 87% rename from bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/PrNotify.java rename to bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/PrNotify.java index c9289e3..40187aa 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/PrNotify.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/PrNotify.java @@ -1,4 +1,4 @@ -package dev.struchkov.bot.gitlab.context.domain.notify.pullrequest; +package dev.struchkov.bot.gitlab.context.domain.notify.mergerequest; import dev.struchkov.bot.gitlab.context.domain.notify.Notify; import lombok.Getter; diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/StatusPrNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/StatusPrNotify.java similarity index 88% rename from bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/StatusPrNotify.java rename to bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/StatusPrNotify.java index 7c0b2c2..9b123d7 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/StatusPrNotify.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/StatusPrNotify.java @@ -1,10 +1,9 @@ -package dev.struchkov.bot.gitlab.context.domain.notify.pullrequest; +package dev.struchkov.bot.gitlab.context.domain.notify.mergerequest; +import dev.struchkov.bot.gitlab.context.domain.MergeRequestState; +import dev.struchkov.bot.gitlab.context.utils.Smile; import lombok.Builder; import lombok.Getter; -import dev.struchkov.bot.gitlab.context.domain.MergeRequestState; -import dev.struchkov.bot.gitlab.context.service.AppSettingService; -import dev.struchkov.bot.gitlab.context.utils.Smile; import java.text.MessageFormat; diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/UpdatePrNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/UpdatePrNotify.java similarity index 96% rename from bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/UpdatePrNotify.java rename to bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/UpdatePrNotify.java index ed1a36d..be6149e 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/UpdatePrNotify.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/UpdatePrNotify.java @@ -1,4 +1,4 @@ -package dev.struchkov.bot.gitlab.context.domain.notify.pullrequest; +package dev.struchkov.bot.gitlab.context.domain.notify.mergerequest; import dev.struchkov.bot.gitlab.context.utils.Smile; import lombok.Builder; diff --git a/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/MergeRequestsServiceImpl.java b/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/MergeRequestsServiceImpl.java index 6bb6c31..a9b6007 100644 --- a/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/MergeRequestsServiceImpl.java +++ b/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/MergeRequestsServiceImpl.java @@ -11,10 +11,10 @@ import dev.struchkov.bot.gitlab.context.domain.entity.MergeRequest; import dev.struchkov.bot.gitlab.context.domain.entity.Person; import dev.struchkov.bot.gitlab.context.domain.entity.Project; import dev.struchkov.bot.gitlab.context.domain.filter.MergeRequestFilter; -import dev.struchkov.bot.gitlab.context.domain.notify.pullrequest.ConflictPrNotify; -import dev.struchkov.bot.gitlab.context.domain.notify.pullrequest.NewPrNotify; -import dev.struchkov.bot.gitlab.context.domain.notify.pullrequest.StatusPrNotify; -import dev.struchkov.bot.gitlab.context.domain.notify.pullrequest.UpdatePrNotify; +import dev.struchkov.bot.gitlab.context.domain.notify.mergerequest.ConflictPrNotify; +import dev.struchkov.bot.gitlab.context.domain.notify.mergerequest.NewPrNotify; +import dev.struchkov.bot.gitlab.context.domain.notify.mergerequest.StatusPrNotify; +import dev.struchkov.bot.gitlab.context.domain.notify.mergerequest.UpdatePrNotify; import dev.struchkov.bot.gitlab.context.repository.MergeRequestRepository; import dev.struchkov.bot.gitlab.context.service.DiscussionService; import dev.struchkov.bot.gitlab.context.service.MergeRequestsService;