diff --git a/bot-context/bot-context-main/pom.xml b/bot-context/bot-context-main/pom.xml index 8a6fb60..0549de0 100644 --- a/bot-context/bot-context-main/pom.xml +++ b/bot-context/bot-context-main/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather bot-context - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT bot-context-main diff --git a/bot-context/bot-context-quarkus/pom.xml b/bot-context/bot-context-quarkus/pom.xml index 983ed6b..64847a2 100644 --- a/bot-context/bot-context-quarkus/pom.xml +++ b/bot-context/bot-context-quarkus/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather bot-context - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT bot-context-quarkus diff --git a/bot-context/bot-context-simple/pom.xml b/bot-context/bot-context-simple/pom.xml index f4008f6..56e99e6 100644 --- a/bot-context/bot-context-simple/pom.xml +++ b/bot-context/bot-context-simple/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather bot-context - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT bot-context-simple diff --git a/bot-context/pom.xml b/bot-context/pom.xml index 7ff5ba0..8b2ddf5 100644 --- a/bot-context/pom.xml +++ b/bot-context/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather godfather-bot - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT bot-context diff --git a/bot-core/bot-core-main/pom.xml b/bot-core/bot-core-main/pom.xml index f75d4d7..ab87dc3 100644 --- a/bot-core/bot-core-main/pom.xml +++ b/bot-core/bot-core-main/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather bot-core - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT bot-core-main diff --git a/bot-core/bot-core-quarkus/pom.xml b/bot-core/bot-core-quarkus/pom.xml index bed9dd9..4fd55ba 100644 --- a/bot-core/bot-core-quarkus/pom.xml +++ b/bot-core/bot-core-quarkus/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather bot-core - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT bot-core-quarkus diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerSaveAction.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerSaveAction.java index 4b18a09..efcb154 100644 --- a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerSaveAction.java +++ b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerSaveAction.java @@ -24,28 +24,30 @@ public class AnswerSaveAction implements ActionUnit, M final AnswerSave answerSave = unitRequest.getUnit(); final Message message = unitRequest.getMessage(); - final AnswerSavePreservable preservable = answerSave.getPreservable(); - final String personId = message.getFromPersonId(); - final CheckSave checkSave = answerSave.getCheckSave(); if (checkNotNull(checkSave)) { return Uni.createFrom().voidItem() .onItem().transformToUni( v -> checkSave.check(message) - .onItem().transform( + .onItem().ifNotNull().transformToUni( unit -> { if (checkNotNull(unit)) { - return UnitRequest.of(unit, message); + return Uni.createFrom().item(UnitRequest.of(unit, message)); } - return UnitRequest.of(answerSave, message); + return getUnitRequestUni(answerSave, message); } ) ); } + return getUnitRequestUni(answerSave, message); + } + + private Uni> getUnitRequestUni(AnswerSave answerSave, Message message) { + final String personId = message.getFromPersonId(); + final AnswerSavePreservable preservable = answerSave.getPreservable(); final PreservableData preservableData = answerSave.getPreservableData(); final Pusher pusher = answerSave.getPusher(); - return Uni.createFrom().voidItem() .onItem().transformToUni( v -> { diff --git a/bot-core/bot-core-simple/pom.xml b/bot-core/bot-core-simple/pom.xml index d3c97c1..c04afb9 100644 --- a/bot-core/bot-core-simple/pom.xml +++ b/bot-core/bot-core-simple/pom.xml @@ -4,7 +4,7 @@ bot-core dev.struchkov.godfather - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT bot-core-simple diff --git a/bot-core/pom.xml b/bot-core/pom.xml index a26ee25..fbe06a4 100644 --- a/bot-core/pom.xml +++ b/bot-core/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather godfather-bot - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT bot-core diff --git a/bot-data/bot-data-main/pom.xml b/bot-data/bot-data-main/pom.xml index 019bd02..858d53d 100644 --- a/bot-data/bot-data-main/pom.xml +++ b/bot-data/bot-data-main/pom.xml @@ -4,7 +4,7 @@ bot-data dev.struchkov.godfather - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT bot-data-main diff --git a/bot-data/bot-data-quarkus/pom.xml b/bot-data/bot-data-quarkus/pom.xml index 6d8b082..e4cb93f 100644 --- a/bot-data/bot-data-quarkus/pom.xml +++ b/bot-data/bot-data-quarkus/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather bot-data - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT bot-data-quarkus diff --git a/bot-data/bot-data-simple/pom.xml b/bot-data/bot-data-simple/pom.xml index 02dca22..6f5b300 100644 --- a/bot-data/bot-data-simple/pom.xml +++ b/bot-data/bot-data-simple/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather bot-data - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT bot-data-simple diff --git a/bot-data/pom.xml b/bot-data/pom.xml index e8ff5b3..5d4fd4f 100644 --- a/bot-data/pom.xml +++ b/bot-data/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather godfather-bot - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT bot-data diff --git a/bot-domain/bot-domain-main/pom.xml b/bot-domain/bot-domain-main/pom.xml index 9f9557f..de558ea 100644 --- a/bot-domain/bot-domain-main/pom.xml +++ b/bot-domain/bot-domain-main/pom.xml @@ -4,7 +4,7 @@ bot-domain dev.struchkov.godfather - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT bot-domain-main diff --git a/bot-domain/bot-domain-quarkus/pom.xml b/bot-domain/bot-domain-quarkus/pom.xml index 8ef5122..77e8c76 100644 --- a/bot-domain/bot-domain-quarkus/pom.xml +++ b/bot-domain/bot-domain-quarkus/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather bot-domain - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT bot-domain-quarkus diff --git a/bot-domain/bot-domain-simple/pom.xml b/bot-domain/bot-domain-simple/pom.xml index a61d636..1249f95 100644 --- a/bot-domain/bot-domain-simple/pom.xml +++ b/bot-domain/bot-domain-simple/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather bot-domain - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT bot-domain-simple diff --git a/bot-domain/pom.xml b/bot-domain/pom.xml index f553bff..55012a9 100644 --- a/bot-domain/pom.xml +++ b/bot-domain/pom.xml @@ -3,7 +3,7 @@ godfather-bot dev.struchkov.godfather - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT 4.0.0 diff --git a/bot-exception/pom.xml b/bot-exception/pom.xml index a5737f7..61ef148 100644 --- a/bot-exception/pom.xml +++ b/bot-exception/pom.xml @@ -3,7 +3,7 @@ dev.struchkov.godfather godfather-bot - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index f015582..924ba6e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather godfather-bot - 0.0.68-SNAPSHOT + 1.0.0-SNAPSHOT pom