From b4d5999d98c00c1ce899f7d9de6cd4371b520674 Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Tue, 23 May 2023 16:32:35 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D0=B2=20?= =?UTF-8?q?AnswerSaveAction?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quarkus/core/action/AnswerSaveAction.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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 -> { From 352da2b733834fdd541765e9ebe5f6942701f7e0 Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Tue, 23 May 2023 16:33:59 +0300 Subject: [PATCH 2/3] [maven-release-plugin] prepare release v.0.0.68 --- bot-context/bot-context-main/pom.xml | 2 +- bot-context/bot-context-quarkus/pom.xml | 2 +- bot-context/bot-context-simple/pom.xml | 2 +- bot-context/pom.xml | 2 +- bot-core/bot-core-main/pom.xml | 2 +- bot-core/bot-core-quarkus/pom.xml | 2 +- bot-core/bot-core-simple/pom.xml | 2 +- bot-core/pom.xml | 2 +- bot-data/bot-data-main/pom.xml | 2 +- bot-data/bot-data-quarkus/pom.xml | 2 +- bot-data/bot-data-simple/pom.xml | 2 +- bot-data/pom.xml | 2 +- bot-domain/bot-domain-main/pom.xml | 2 +- bot-domain/bot-domain-quarkus/pom.xml | 2 +- bot-domain/bot-domain-simple/pom.xml | 2 +- bot-domain/pom.xml | 2 +- bot-exception/pom.xml | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bot-context/bot-context-main/pom.xml b/bot-context/bot-context-main/pom.xml index c9016ce..c75b059 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.67-SNAPSHOT + 0.0.68 bot-context-main diff --git a/bot-context/bot-context-quarkus/pom.xml b/bot-context/bot-context-quarkus/pom.xml index e012e43..05f317d 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.67-SNAPSHOT + 0.0.68 bot-context-quarkus diff --git a/bot-context/bot-context-simple/pom.xml b/bot-context/bot-context-simple/pom.xml index 9362007..16d3e38 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.67-SNAPSHOT + 0.0.68 bot-context-simple diff --git a/bot-context/pom.xml b/bot-context/pom.xml index d15d1fb..51d993c 100644 --- a/bot-context/pom.xml +++ b/bot-context/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather godfather-bot - 0.0.67-SNAPSHOT + 0.0.68 bot-context diff --git a/bot-core/bot-core-main/pom.xml b/bot-core/bot-core-main/pom.xml index 6810607..c3d5541 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.67-SNAPSHOT + 0.0.68 bot-core-main diff --git a/bot-core/bot-core-quarkus/pom.xml b/bot-core/bot-core-quarkus/pom.xml index 32d67af..ba7265d 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.67-SNAPSHOT + 0.0.68 bot-core-quarkus diff --git a/bot-core/bot-core-simple/pom.xml b/bot-core/bot-core-simple/pom.xml index 8fcef86..06197f0 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.67-SNAPSHOT + 0.0.68 bot-core-simple diff --git a/bot-core/pom.xml b/bot-core/pom.xml index 77fb583..296ea27 100644 --- a/bot-core/pom.xml +++ b/bot-core/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather godfather-bot - 0.0.67-SNAPSHOT + 0.0.68 bot-core diff --git a/bot-data/bot-data-main/pom.xml b/bot-data/bot-data-main/pom.xml index f29a4ba..fc484cc 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.67-SNAPSHOT + 0.0.68 bot-data-main diff --git a/bot-data/bot-data-quarkus/pom.xml b/bot-data/bot-data-quarkus/pom.xml index 93e4433..a9d54ed 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.67-SNAPSHOT + 0.0.68 bot-data-quarkus diff --git a/bot-data/bot-data-simple/pom.xml b/bot-data/bot-data-simple/pom.xml index 41a5f6d..675ee25 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.67-SNAPSHOT + 0.0.68 bot-data-simple diff --git a/bot-data/pom.xml b/bot-data/pom.xml index 1045dd2..ca1fa05 100644 --- a/bot-data/pom.xml +++ b/bot-data/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather godfather-bot - 0.0.67-SNAPSHOT + 0.0.68 bot-data diff --git a/bot-domain/bot-domain-main/pom.xml b/bot-domain/bot-domain-main/pom.xml index 901d2a3..f925b83 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.67-SNAPSHOT + 0.0.68 bot-domain-main diff --git a/bot-domain/bot-domain-quarkus/pom.xml b/bot-domain/bot-domain-quarkus/pom.xml index 7731438..0f19dc5 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.67-SNAPSHOT + 0.0.68 bot-domain-quarkus diff --git a/bot-domain/bot-domain-simple/pom.xml b/bot-domain/bot-domain-simple/pom.xml index 5980f5a..943b4b6 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.67-SNAPSHOT + 0.0.68 bot-domain-simple diff --git a/bot-domain/pom.xml b/bot-domain/pom.xml index f67d63b..bd5d114 100644 --- a/bot-domain/pom.xml +++ b/bot-domain/pom.xml @@ -3,7 +3,7 @@ godfather-bot dev.struchkov.godfather - 0.0.67-SNAPSHOT + 0.0.68 4.0.0 diff --git a/bot-exception/pom.xml b/bot-exception/pom.xml index bbb51b9..9225497 100644 --- a/bot-exception/pom.xml +++ b/bot-exception/pom.xml @@ -3,7 +3,7 @@ dev.struchkov.godfather godfather-bot - 0.0.67-SNAPSHOT + 0.0.68 4.0.0 diff --git a/pom.xml b/pom.xml index 5bcc8a5..47bfeef 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather godfather-bot - 0.0.67-SNAPSHOT + 0.0.68 pom @@ -383,7 +383,7 @@ scm:git:ssh://git@git.struchkov.dev:222/Godfather-Bots/godfather.git https://git.struchkov.dev/Godfather-Bots/godfather scm:git:ssh://git@git.struchkov.dev:222/Godfather-Bots/godfather.git - v.0.0.33 + v.0.0.68 From caf88a210ef3efee3f0bcdc866739350c9ef123b Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Tue, 23 May 2023 16:34:00 +0300 Subject: [PATCH 3/3] [maven-release-plugin] prepare for next development iteration --- bot-context/bot-context-main/pom.xml | 2 +- bot-context/bot-context-quarkus/pom.xml | 2 +- bot-context/bot-context-simple/pom.xml | 2 +- bot-context/pom.xml | 2 +- bot-core/bot-core-main/pom.xml | 2 +- bot-core/bot-core-quarkus/pom.xml | 2 +- bot-core/bot-core-simple/pom.xml | 2 +- bot-core/pom.xml | 2 +- bot-data/bot-data-main/pom.xml | 2 +- bot-data/bot-data-quarkus/pom.xml | 2 +- bot-data/bot-data-simple/pom.xml | 2 +- bot-data/pom.xml | 2 +- bot-domain/bot-domain-main/pom.xml | 2 +- bot-domain/bot-domain-quarkus/pom.xml | 2 +- bot-domain/bot-domain-simple/pom.xml | 2 +- bot-domain/pom.xml | 2 +- bot-exception/pom.xml | 2 +- pom.xml | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bot-context/bot-context-main/pom.xml b/bot-context/bot-context-main/pom.xml index c75b059..11d8644 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 + 0.0.69-SNAPSHOT bot-context-main diff --git a/bot-context/bot-context-quarkus/pom.xml b/bot-context/bot-context-quarkus/pom.xml index 05f317d..be0c6d1 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 + 0.0.69-SNAPSHOT bot-context-quarkus diff --git a/bot-context/bot-context-simple/pom.xml b/bot-context/bot-context-simple/pom.xml index 16d3e38..9d4570d 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 + 0.0.69-SNAPSHOT bot-context-simple diff --git a/bot-context/pom.xml b/bot-context/pom.xml index 51d993c..e237a4e 100644 --- a/bot-context/pom.xml +++ b/bot-context/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather godfather-bot - 0.0.68 + 0.0.69-SNAPSHOT bot-context diff --git a/bot-core/bot-core-main/pom.xml b/bot-core/bot-core-main/pom.xml index c3d5541..1f287b0 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 + 0.0.69-SNAPSHOT bot-core-main diff --git a/bot-core/bot-core-quarkus/pom.xml b/bot-core/bot-core-quarkus/pom.xml index ba7265d..883c56c 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 + 0.0.69-SNAPSHOT bot-core-quarkus diff --git a/bot-core/bot-core-simple/pom.xml b/bot-core/bot-core-simple/pom.xml index 06197f0..703baf0 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 + 0.0.69-SNAPSHOT bot-core-simple diff --git a/bot-core/pom.xml b/bot-core/pom.xml index 296ea27..c54e899 100644 --- a/bot-core/pom.xml +++ b/bot-core/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather godfather-bot - 0.0.68 + 0.0.69-SNAPSHOT bot-core diff --git a/bot-data/bot-data-main/pom.xml b/bot-data/bot-data-main/pom.xml index fc484cc..654aca9 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 + 0.0.69-SNAPSHOT bot-data-main diff --git a/bot-data/bot-data-quarkus/pom.xml b/bot-data/bot-data-quarkus/pom.xml index a9d54ed..64f3e2e 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 + 0.0.69-SNAPSHOT bot-data-quarkus diff --git a/bot-data/bot-data-simple/pom.xml b/bot-data/bot-data-simple/pom.xml index 675ee25..8153a91 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 + 0.0.69-SNAPSHOT bot-data-simple diff --git a/bot-data/pom.xml b/bot-data/pom.xml index ca1fa05..f653372 100644 --- a/bot-data/pom.xml +++ b/bot-data/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather godfather-bot - 0.0.68 + 0.0.69-SNAPSHOT bot-data diff --git a/bot-domain/bot-domain-main/pom.xml b/bot-domain/bot-domain-main/pom.xml index f925b83..739b015 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 + 0.0.69-SNAPSHOT bot-domain-main diff --git a/bot-domain/bot-domain-quarkus/pom.xml b/bot-domain/bot-domain-quarkus/pom.xml index 0f19dc5..c379969 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 + 0.0.69-SNAPSHOT bot-domain-quarkus diff --git a/bot-domain/bot-domain-simple/pom.xml b/bot-domain/bot-domain-simple/pom.xml index 943b4b6..fd8cdab 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 + 0.0.69-SNAPSHOT bot-domain-simple diff --git a/bot-domain/pom.xml b/bot-domain/pom.xml index bd5d114..f1620ea 100644 --- a/bot-domain/pom.xml +++ b/bot-domain/pom.xml @@ -3,7 +3,7 @@ godfather-bot dev.struchkov.godfather - 0.0.68 + 0.0.69-SNAPSHOT 4.0.0 diff --git a/bot-exception/pom.xml b/bot-exception/pom.xml index 9225497..3d9dc99 100644 --- a/bot-exception/pom.xml +++ b/bot-exception/pom.xml @@ -3,7 +3,7 @@ dev.struchkov.godfather godfather-bot - 0.0.68 + 0.0.69-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 47bfeef..f2dc6eb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.godfather godfather-bot - 0.0.68 + 0.0.69-SNAPSHOT pom @@ -383,7 +383,7 @@ scm:git:ssh://git@git.struchkov.dev:222/Godfather-Bots/godfather.git https://git.struchkov.dev/Godfather-Bots/godfather scm:git:ssh://git@git.struchkov.dev:222/Godfather-Bots/godfather.git - v.0.0.68 + v.0.0.33