diff --git a/bot-context/bot-context-simple/pom.xml b/bot-context/bot-context-simple/pom.xml index cf61a5c..29ae525 100644 --- a/bot-context/bot-context-simple/pom.xml +++ b/bot-context/bot-context-simple/pom.xml @@ -16,6 +16,11 @@ + + dev.struchkov.godfather + bot-context-main + + dev.struchkov.godfather bot-domain-simple diff --git a/bot-context/pom.xml b/bot-context/pom.xml index 4c896ba..8a889c1 100644 --- a/bot-context/pom.xml +++ b/bot-context/pom.xml @@ -28,24 +28,6 @@ dev.struchkov.haiti haiti-utils - - - javax.persistence - javax.persistence-api - - - javax.validation - validation-api - - - - org.slf4j - slf4j-api - - - org.jetbrains - annotations - \ No newline at end of file diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/service/StorylineContextMapImpl.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/service/StorylineContextMapImpl.java index 60b5013..63e42a7 100644 --- a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/service/StorylineContextMapImpl.java +++ b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/service/StorylineContextMapImpl.java @@ -1,7 +1,7 @@ package dev.struchkov.godfather.quarkus.core.service; -import dev.struchkov.godfather.main.domain.ContextKey; import dev.struchkov.godfather.quarkus.data.StorylineContext; +import dev.struchkov.haiti.utils.container.ContextKey; import io.smallrye.mutiny.Uni; import org.jetbrains.annotations.NotNull; diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/service/StorylineContextMapImpl.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/service/StorylineContextMapImpl.java index 03a4d8b..c461962 100644 --- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/service/StorylineContextMapImpl.java +++ b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/service/StorylineContextMapImpl.java @@ -1,7 +1,7 @@ package dev.struchkov.godfather.simple.core.service; -import dev.struchkov.godfather.main.domain.ContextKey; import dev.struchkov.godfather.simple.data.StorylineContext; +import dev.struchkov.haiti.utils.container.ContextKey; import org.jetbrains.annotations.NotNull; import java.util.HashMap; diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/PreservableDataSimple.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/PreservableDataSimple.java index bd15abc..df8f09a 100644 --- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/PreservableDataSimple.java +++ b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/PreservableDataSimple.java @@ -1,7 +1,7 @@ package dev.struchkov.godfather.simple.core.unit.func; import dev.struchkov.godfather.main.domain.content.Message; -import dev.struchkov.haiti.utils.Pair; +import dev.struchkov.haiti.utils.container.Pair; /** * TODO: Добавить описание класса. diff --git a/bot-data/bot-data-quarkus/src/main/java/dev/struchkov/godfather/quarkus/data/StorylineContext.java b/bot-data/bot-data-quarkus/src/main/java/dev/struchkov/godfather/quarkus/data/StorylineContext.java index e10ba9a..bb0e9dc 100644 --- a/bot-data/bot-data-quarkus/src/main/java/dev/struchkov/godfather/quarkus/data/StorylineContext.java +++ b/bot-data/bot-data-quarkus/src/main/java/dev/struchkov/godfather/quarkus/data/StorylineContext.java @@ -1,6 +1,6 @@ package dev.struchkov.godfather.quarkus.data; -import dev.struchkov.godfather.main.domain.ContextKey; +import dev.struchkov.haiti.utils.container.ContextKey; import io.smallrye.mutiny.Uni; import org.jetbrains.annotations.NotNull; diff --git a/bot-data/bot-data-simple/src/main/java/dev/struchkov/godfather/simple/data/StorylineContext.java b/bot-data/bot-data-simple/src/main/java/dev/struchkov/godfather/simple/data/StorylineContext.java index e0a7726..4ccf27f 100644 --- a/bot-data/bot-data-simple/src/main/java/dev/struchkov/godfather/simple/data/StorylineContext.java +++ b/bot-data/bot-data-simple/src/main/java/dev/struchkov/godfather/simple/data/StorylineContext.java @@ -1,6 +1,6 @@ package dev.struchkov.godfather.simple.data; -import dev.struchkov.godfather.main.domain.ContextKey; +import dev.struchkov.haiti.utils.container.ContextKey; import org.jetbrains.annotations.NotNull; import java.util.Map; diff --git a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/ContextKey.java b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/ContextKey.java deleted file mode 100644 index 6e4f32a..0000000 --- a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/ContextKey.java +++ /dev/null @@ -1,23 +0,0 @@ -package dev.struchkov.godfather.main.domain; - -public interface ContextKey { - - String getValue(); - - Class getType(); - - static ContextKey of(String value, Class type) { - return new ContextKey<>() { - @Override - public String getValue() { - return value; - } - - @Override - public Class getType() { - return type; - } - }; - } - -} diff --git a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/Message.java b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/Message.java index 7471fe6..7b33137 100644 --- a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/Message.java +++ b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/Message.java @@ -1,7 +1,7 @@ package dev.struchkov.godfather.main.domain.content; import dev.struchkov.autoresponder.entity.DeliverableText; -import dev.struchkov.godfather.main.domain.ContextKey; +import dev.struchkov.haiti.utils.container.ContextKey; import java.time.LocalDateTime; import java.util.HashMap; diff --git a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/keyboard/button/SimpleButton.java b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/keyboard/button/SimpleButton.java index dac645d..5f55110 100644 --- a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/keyboard/button/SimpleButton.java +++ b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/keyboard/button/SimpleButton.java @@ -1,10 +1,12 @@ package dev.struchkov.godfather.main.domain.keyboard.button; import dev.struchkov.godfather.main.domain.keyboard.KeyBoardButton; -import org.jetbrains.annotations.NotNull; import java.util.Objects; +import static dev.struchkov.haiti.utils.Inspector.Utils.nullPointer; +import static dev.struchkov.haiti.utils.Inspector.isNotNull; + /** * Абстрактная сущность кнопки для клавиатуры. * @@ -28,11 +30,13 @@ public class SimpleButton implements KeyBoardButton { this.callbackData = callbackData; } - public static SimpleButton simpleButton(@NotNull String label, String callbackData) { + public static SimpleButton simpleButton(String label, String callbackData) { + isNotNull(label, nullPointer("label")); return new SimpleButton(label, callbackData); } - public static SimpleButton simpleButton(@NotNull String label) { + public static SimpleButton simpleButton(String label) { + isNotNull(label, nullPointer("label")); return new SimpleButton(label, null); } diff --git a/bot-domain/bot-domain-quarkus/src/main/java/dev/struchkov/godfather/quarkus/domain/BoxAnswer.java b/bot-domain/bot-domain-quarkus/src/main/java/dev/struchkov/godfather/quarkus/domain/BoxAnswer.java index ebc58f8..2e801e7 100644 --- a/bot-domain/bot-domain-quarkus/src/main/java/dev/struchkov/godfather/quarkus/domain/BoxAnswer.java +++ b/bot-domain/bot-domain-quarkus/src/main/java/dev/struchkov/godfather/quarkus/domain/BoxAnswer.java @@ -1,8 +1,8 @@ package dev.struchkov.godfather.quarkus.domain; -import dev.struchkov.godfather.main.domain.ContextKey; import dev.struchkov.godfather.main.domain.keyboard.KeyBoard; +import dev.struchkov.haiti.utils.container.ContextKey; import java.util.HashMap; import java.util.Map; diff --git a/bot-domain/bot-domain-simple/src/main/java/dev/struchkov/godfather/simple/domain/BoxAnswer.java b/bot-domain/bot-domain-simple/src/main/java/dev/struchkov/godfather/simple/domain/BoxAnswer.java index 09a7a1d..0c1d4c6 100644 --- a/bot-domain/bot-domain-simple/src/main/java/dev/struchkov/godfather/simple/domain/BoxAnswer.java +++ b/bot-domain/bot-domain-simple/src/main/java/dev/struchkov/godfather/simple/domain/BoxAnswer.java @@ -1,7 +1,7 @@ package dev.struchkov.godfather.simple.domain; -import dev.struchkov.godfather.main.domain.ContextKey; import dev.struchkov.godfather.main.domain.keyboard.KeyBoard; +import dev.struchkov.haiti.utils.container.ContextKey; import java.util.HashMap; import java.util.Map; diff --git a/pom.xml b/pom.xml index b619054..2cacd4a 100644 --- a/pom.xml +++ b/pom.xml @@ -34,22 +34,26 @@ UTF-8 UTF-8 - ${project.version} - ${project.version} + 3.6.1 + 2.6.0 - 3.5.0 - 2.2.0 + + 2.30.1 - 2.2 - 2.0.1.Final - 1.7.36 - 23.0.0 + + 24.0.0 + 3.10.1 + 1.6.13 + 3.2.1 - 3.4.0 + + 3.5.0 + 3.0.1 + 3.0.0-M7 @@ -137,31 +141,15 @@ - javax.persistence - javax.persistence-api - ${javax.persistence.api.ver} - - - javax.validation - validation-api - ${validation.api.ver} + io.smallrye.reactive + smallrye-mutiny-vertx-core + ${smallrye.mutiny.vertx.core.version} + org.jetbrains annotations - ${jetbrains.annotations.ver} - - - - io.smallrye.reactive - smallrye-mutiny-vertx-core - 2.24.1 - - - - org.slf4j - slf4j-api - ${slf4j.api.ver} + ${jetbrains.annotations.version}