From 2f2f3319a2880dd36754c74f1c8477e107ea3181 Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Sun, 23 Apr 2023 04:12:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D1=83=D0=B6=D0=BD=D1=8B=D0=B9=20PersonSettingServi?= =?UTF-8?q?ce.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/PersonSettingRepository.java | 17 ------- .../context/service/PersonSettingService.java | 18 ------- .../repository/PersonSettingRepository.java | 16 ------ .../context/service/PersonSettingService.java | 18 ------- .../quarkus/core/GeneralAutoResponder.java | 51 ++----------------- .../service/PersonSettingServiceImpl.java | 42 --------------- .../simple/core/GeneralAutoResponder.java | 34 ++----------- .../service/PersonSettingServiceImpl.java | 42 --------------- .../impl/PersonSettingLocalRepository.java | 41 --------------- .../impl/PersonSettingLocalRepository.java | 37 -------------- 10 files changed, 9 insertions(+), 307 deletions(-) delete mode 100644 bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/repository/PersonSettingRepository.java delete mode 100644 bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/PersonSettingService.java delete mode 100644 bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/repository/PersonSettingRepository.java delete mode 100644 bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/PersonSettingService.java delete mode 100644 bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/service/PersonSettingServiceImpl.java delete mode 100644 bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/service/PersonSettingServiceImpl.java delete mode 100644 bot-data/bot-data-quarkus/src/main/java/dev/struchkov/godfather/quarkus/data/repository/impl/PersonSettingLocalRepository.java delete mode 100644 bot-data/bot-data-simple/src/main/java/dev/struchkov/godfather/simple/data/repository/impl/PersonSettingLocalRepository.java diff --git a/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/repository/PersonSettingRepository.java b/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/repository/PersonSettingRepository.java deleted file mode 100644 index 6749592..0000000 --- a/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/repository/PersonSettingRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package dev.struchkov.godfather.quarkus.context.repository; - -import io.smallrye.mutiny.Uni; - -import java.util.Set; - -public interface PersonSettingRepository { - - Uni> findAllByAllowedProcessing(Set personIds); - - Uni disableMessageProcessing(String personId); - - Uni enableMessageProcessing(String personId); - - Uni findStateByPersonId(String personId); - -} diff --git a/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/PersonSettingService.java b/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/PersonSettingService.java deleted file mode 100644 index 7dc1df5..0000000 --- a/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/PersonSettingService.java +++ /dev/null @@ -1,18 +0,0 @@ -package dev.struchkov.godfather.quarkus.context.service; - -import io.smallrye.mutiny.Uni; -import org.jetbrains.annotations.NotNull; - -import java.util.Set; - -public interface PersonSettingService { - - Uni> getAllPersonIdDisableMessages(@NotNull Set personIds); - - Uni getStateProcessingByPersonId(@NotNull String personId); - - Uni disableMessageProcessing(@NotNull String personId); - - Uni enableMessageProcessing(@NotNull String personId); - -} diff --git a/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/repository/PersonSettingRepository.java b/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/repository/PersonSettingRepository.java deleted file mode 100644 index 6f97cbf..0000000 --- a/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/repository/PersonSettingRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package dev.struchkov.godfather.simple.context.repository; - -import java.util.Optional; -import java.util.Set; - -public interface PersonSettingRepository { - - Set findAllByAllowedProcessing(Set personIds); - - void disableMessageProcessing(String personId); - - void enableMessageProcessing(String personId); - - Optional findStateByPersonId(String personId); - -} diff --git a/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/PersonSettingService.java b/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/PersonSettingService.java deleted file mode 100644 index 9831eff..0000000 --- a/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/PersonSettingService.java +++ /dev/null @@ -1,18 +0,0 @@ -package dev.struchkov.godfather.simple.context.service; - -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.Set; - -public interface PersonSettingService { - - Set getAllPersonIdDisableMessages(@NotNull Set personIds); - - Optional getStateProcessingByPersonId(@NotNull String personId); - - void disableMessageProcessing(@NotNull String personId); - - void enableMessageProcessing(@NotNull String personId); - -} diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/GeneralAutoResponder.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/GeneralAutoResponder.java index e598176..f98092c 100644 --- a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/GeneralAutoResponder.java +++ b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/GeneralAutoResponder.java @@ -4,7 +4,6 @@ import dev.struchkov.godfather.main.domain.content.Message; import dev.struchkov.godfather.main.domain.unit.UnitActiveType; import dev.struchkov.godfather.quarkus.context.service.ErrorHandler; import dev.struchkov.godfather.quarkus.context.service.Modifiable; -import dev.struchkov.godfather.quarkus.context.service.PersonSettingService; import dev.struchkov.godfather.quarkus.core.action.ActionUnit; import dev.struchkov.godfather.quarkus.core.service.StorylineService; import dev.struchkov.godfather.quarkus.domain.unit.MainUnit; @@ -20,17 +19,13 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.function.Function; -import java.util.stream.Collectors; import static dev.struchkov.haiti.utils.Checker.checkEmpty; import static dev.struchkov.haiti.utils.Checker.checkNotNull; -import static java.lang.Boolean.TRUE; import static java.util.Collections.emptyList; -import static java.util.Collections.emptySet; public class GeneralAutoResponder { - protected PersonSettingService personSettingService; protected final StorylineService storyLineService; protected Map> actionUnitMap = new HashMap<>(); protected List> modifiable; @@ -40,10 +35,6 @@ public class GeneralAutoResponder { this.storyLineService = storyLineService; } - public void setPersonSettingService(PersonSettingService personSettingService) { - this.personSettingService = personSettingService; - } - public void registrationActionUnit(ActionUnit actionUnit) { actionUnitMap.computeIfAbsent(actionUnit.getUnitType(), k -> new ArrayList<>()); actionUnitMap.get(actionUnit.getUnitType()).add(actionUnit); @@ -67,22 +58,7 @@ public class GeneralAutoResponder { public Uni processingNewMessage(M newMessage) { return Uni.createFrom().item(newMessage) .onItem().ifNotNull().transformToUni( - message -> { - if (checkNotNull(personSettingService)) { - return personSettingService.getStateProcessingByPersonId(newMessage.getFromPersonId()) - .replaceIfNullWith(TRUE) - .flatMap( - state -> { - if (TRUE.equals(state)) { - return processing(newMessage); - } - return Uni.createFrom().voidItem(); - } - ); - } else { - return processing(newMessage); - } - } + message -> processing(newMessage) ) .replaceWithVoid(); } @@ -92,28 +68,9 @@ public class GeneralAutoResponder { .onItem().ifNotNull().transformToUni( messages -> { if (checkEmpty(newMessages)) return Uni.createFrom().voidItem(); - - final Set personIds = newMessages.stream() - .map(Message::getFromPersonId) - .collect(Collectors.toSet()); - if (checkNotNull(personSettingService)) { - return personSettingService.getAllPersonIdDisableMessages(personIds) - .replaceIfNullWith(emptySet()) - .onItem().transformToMulti( - disableIds -> { - final List allowedMessages = newMessages.stream() - .filter(message -> !disableIds.contains(message.getFromPersonId())) - .toList(); - return Multi.createFrom().iterable(allowedMessages); - } - ) - .onItem().transform(this::processing) - .collect().asList().replaceWithVoid(); - } else { - return Multi.createFrom().iterable(newMessages) - .onItem().transform(this::processing) - .collect().asList().replaceWithVoid(); - } + return Multi.createFrom().iterable(newMessages) + .onItem().transform(this::processing) + .collect().asList().replaceWithVoid(); } ); } diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/service/PersonSettingServiceImpl.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/service/PersonSettingServiceImpl.java deleted file mode 100644 index 731f633..0000000 --- a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/service/PersonSettingServiceImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -package dev.struchkov.godfather.quarkus.core.service; - -import dev.struchkov.godfather.quarkus.context.repository.PersonSettingRepository; -import dev.struchkov.godfather.quarkus.context.service.PersonSettingService; -import dev.struchkov.haiti.utils.Inspector; -import io.smallrye.mutiny.Uni; -import org.jetbrains.annotations.NotNull; - -import java.util.Set; - -public class PersonSettingServiceImpl implements PersonSettingService { - - private final PersonSettingRepository personSettingRepository; - - public PersonSettingServiceImpl(PersonSettingRepository personSettingRepository) { - this.personSettingRepository = personSettingRepository; - } - - @Override - public Uni> getAllPersonIdDisableMessages(@NotNull Set personIds) { - Inspector.isNotNull(personIds); - return personSettingRepository.findAllByAllowedProcessing(personIds); - } - - @Override - public Uni getStateProcessingByPersonId(@NotNull String personId) { - return personSettingRepository.findStateByPersonId(personId); - } - - @Override - public Uni disableMessageProcessing(@NotNull String personId) { - Inspector.isNotNull(personId); - return personSettingRepository.disableMessageProcessing(personId); - } - - @Override - public Uni enableMessageProcessing(@NotNull String personId) { - Inspector.isNotNull(personId); - return personSettingRepository.enableMessageProcessing(personId); - } - -} diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/GeneralAutoResponder.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/GeneralAutoResponder.java index 3fdf20e..22ed340 100644 --- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/GeneralAutoResponder.java +++ b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/GeneralAutoResponder.java @@ -5,7 +5,6 @@ import dev.struchkov.godfather.main.domain.unit.UnitActiveType; import dev.struchkov.godfather.simple.context.service.Accessibility; import dev.struchkov.godfather.simple.context.service.ErrorHandler; import dev.struchkov.godfather.simple.context.service.Modifiable; -import dev.struchkov.godfather.simple.context.service.PersonSettingService; import dev.struchkov.godfather.simple.core.action.ActionUnit; import dev.struchkov.godfather.simple.core.service.StorylineService; import dev.struchkov.godfather.simple.domain.unit.MainUnit; @@ -22,7 +21,6 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; -import java.util.stream.Collectors; import static dev.struchkov.haiti.utils.Checker.checkNotEmpty; import static dev.struchkov.haiti.utils.Checker.checkNotNull; @@ -31,7 +29,6 @@ public class GeneralAutoResponder { private static final Logger log = LoggerFactory.getLogger(GeneralAutoResponder.class); - protected final PersonSettingService personSettingService; protected final StorylineService storyLineService; protected Map> actionUnitMap = new HashMap<>(); @@ -39,11 +36,7 @@ public class GeneralAutoResponder { protected ErrorHandler errorHandler; protected ExecutorService executorService; - protected GeneralAutoResponder( - PersonSettingService personSettingService, - StorylineService storyLineService - ) { - this.personSettingService = personSettingService; + protected GeneralAutoResponder(StorylineService storyLineService) { this.storyLineService = storyLineService; } @@ -75,42 +68,25 @@ public class GeneralAutoResponder { if (checkNotNull(newMessage)) { if (checkNotNull(executorService)) { CompletableFuture.runAsync( - () -> { - final boolean state = personSettingService.getStateProcessingByPersonId(newMessage.getFromPersonId()) - .orElse(true); - if (state) { - processing(newMessage); - } - }, executorService + () -> processing(newMessage), executorService ).exceptionally(ex -> { log.error(ex.getMessage(), ex); return null; }); } else { - final boolean state = personSettingService.getStateProcessingByPersonId(newMessage.getFromPersonId()) - .orElse(true); - if (state) { - processing(newMessage); - } + processing(newMessage); } } } public void processingNewMessages(List newMessages) { if (checkNotEmpty(newMessages)) { - final Set personIds = newMessages.stream() - .map(Message::getFromPersonId) - .collect(Collectors.toSet()); - final Set disableIds = personSettingService.getAllPersonIdDisableMessages(personIds); - final List allowedMessages = newMessages.stream() - .filter(message -> !disableIds.contains(message.getFromPersonId())) - .toList(); if (checkNotNull(executorService)) { - for (M allowedMessage : allowedMessages) { + for (M allowedMessage : newMessages) { executorService.submit(() -> processing(allowedMessage)); } } else { - for (M allowedMessage : allowedMessages) { + for (M allowedMessage : newMessages) { processing(allowedMessage); } } diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/service/PersonSettingServiceImpl.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/service/PersonSettingServiceImpl.java deleted file mode 100644 index 42bed65..0000000 --- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/service/PersonSettingServiceImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -package dev.struchkov.godfather.simple.core.service; - -import dev.struchkov.godfather.simple.context.repository.PersonSettingRepository; -import dev.struchkov.godfather.simple.context.service.PersonSettingService; -import dev.struchkov.haiti.utils.Inspector; -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.Set; - -public class PersonSettingServiceImpl implements PersonSettingService { - - private final PersonSettingRepository personSettingRepository; - - public PersonSettingServiceImpl(PersonSettingRepository personSettingRepository) { - this.personSettingRepository = personSettingRepository; - } - - @Override - public Set getAllPersonIdDisableMessages(@NotNull Set personIds) { - Inspector.isNotNull(personIds); - return personSettingRepository.findAllByAllowedProcessing(personIds); - } - - @Override - public Optional getStateProcessingByPersonId(@NotNull String personId) { - return personSettingRepository.findStateByPersonId(personId); - } - - @Override - public void disableMessageProcessing(@NotNull String personId) { - Inspector.isNotNull(personId); - personSettingRepository.disableMessageProcessing(personId); - } - - @Override - public void enableMessageProcessing(@NotNull String personId) { - Inspector.isNotNull(personId); - personSettingRepository.enableMessageProcessing(personId); - } - -} diff --git a/bot-data/bot-data-quarkus/src/main/java/dev/struchkov/godfather/quarkus/data/repository/impl/PersonSettingLocalRepository.java b/bot-data/bot-data-quarkus/src/main/java/dev/struchkov/godfather/quarkus/data/repository/impl/PersonSettingLocalRepository.java deleted file mode 100644 index a4862c4..0000000 --- a/bot-data/bot-data-quarkus/src/main/java/dev/struchkov/godfather/quarkus/data/repository/impl/PersonSettingLocalRepository.java +++ /dev/null @@ -1,41 +0,0 @@ -package dev.struchkov.godfather.quarkus.data.repository.impl; - -import dev.struchkov.godfather.quarkus.context.repository.PersonSettingRepository; -import io.smallrye.mutiny.Uni; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -public class PersonSettingLocalRepository implements PersonSettingRepository { - - private final Map map = new HashMap<>(); - - @Override - public Uni> findAllByAllowedProcessing(Set personIds) { - return Uni.createFrom().item( - personIds.stream() - .filter(map::get) - .collect(Collectors.toSet()) - ); - } - - @Override - public Uni disableMessageProcessing(String personId) { - map.put(personId, false); - return Uni.createFrom().voidItem(); - } - - @Override - public Uni enableMessageProcessing(String personId) { - map.put(personId, true); - return Uni.createFrom().voidItem(); - } - - @Override - public Uni findStateByPersonId(String personId) { - return Uni.createFrom().item(map.get(personId)); - } - -} diff --git a/bot-data/bot-data-simple/src/main/java/dev/struchkov/godfather/simple/data/repository/impl/PersonSettingLocalRepository.java b/bot-data/bot-data-simple/src/main/java/dev/struchkov/godfather/simple/data/repository/impl/PersonSettingLocalRepository.java deleted file mode 100644 index 69ed044..0000000 --- a/bot-data/bot-data-simple/src/main/java/dev/struchkov/godfather/simple/data/repository/impl/PersonSettingLocalRepository.java +++ /dev/null @@ -1,37 +0,0 @@ -package dev.struchkov.godfather.simple.data.repository.impl; - -import dev.struchkov.godfather.simple.context.repository.PersonSettingRepository; - -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - -public class PersonSettingLocalRepository implements PersonSettingRepository { - - private final Map map = new HashMap<>(); - - @Override - public Set findAllByAllowedProcessing(Set personIds) { - return personIds.stream() - .filter(map::get) - .collect(Collectors.toSet()); - } - - @Override - public void disableMessageProcessing(String personId) { - map.put(personId, false); - } - - @Override - public void enableMessageProcessing(String personId) { - map.put(personId, true); - } - - @Override - public Optional findStateByPersonId(String personId) { - return Optional.ofNullable(map.get(personId)); - } - -}