From 084f39be0b54692dccc30093cf199d944c5934f3 Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Mon, 24 Apr 2023 10:05:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20=D0=B8?= =?UTF-8?q?=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20PersonSetting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- .../config/TelegramBotAutoconfiguration.java | 15 ++------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index dc329c1..0e78b05 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ dev.struchkov.godfather.telegram telegram-bot-spring-boot-starter - 0.0.56-SNAPSHOT + 0.0.56 17 @@ -297,7 +297,7 @@ https://git.struchkov.dev/Godfather-Bots/telegram-bot-spring-boot-starter scm:git:https://git.struchkov.dev/Godfather-Bots/telegram-bot-spring-boot-starter.git - HEAD + v.0.0.56 diff --git a/src/main/java/dev/struchkov/godfather/telegram/starter/config/TelegramBotAutoconfiguration.java b/src/main/java/dev/struchkov/godfather/telegram/starter/config/TelegramBotAutoconfiguration.java index 4f175ee..9c76e57 100644 --- a/src/main/java/dev/struchkov/godfather/telegram/starter/config/TelegramBotAutoconfiguration.java +++ b/src/main/java/dev/struchkov/godfather/telegram/starter/config/TelegramBotAutoconfiguration.java @@ -2,13 +2,11 @@ package dev.struchkov.godfather.telegram.starter.config; import dev.struchkov.godfather.main.domain.content.ChatMail; import dev.struchkov.godfather.main.domain.content.Mail; -import dev.struchkov.godfather.simple.context.repository.PersonSettingRepository; import dev.struchkov.godfather.simple.context.repository.StorylineRepository; import dev.struchkov.godfather.simple.context.repository.UnitPointerRepository; import dev.struchkov.godfather.simple.context.service.ErrorHandler; import dev.struchkov.godfather.simple.context.service.EventDispatching; import dev.struchkov.godfather.simple.context.service.EventHandler; -import dev.struchkov.godfather.simple.context.service.PersonSettingService; import dev.struchkov.godfather.simple.context.service.UnitPointerService; import dev.struchkov.godfather.simple.core.EventDispatchingImpl; import dev.struchkov.godfather.simple.core.action.AnswerCheckAction; @@ -17,7 +15,6 @@ import dev.struchkov.godfather.simple.core.action.AnswerTextChatMailAction; import dev.struchkov.godfather.simple.core.action.AnswerTextMailAction; import dev.struchkov.godfather.simple.core.provider.ChatStoryLineHandler; import dev.struchkov.godfather.simple.core.provider.PersonStoryLineHandler; -import dev.struchkov.godfather.simple.core.service.PersonSettingServiceImpl; import dev.struchkov.godfather.simple.core.service.StorylineMailService; import dev.struchkov.godfather.simple.core.service.StorylineService; import dev.struchkov.godfather.simple.core.service.UnitPointerServiceImpl; @@ -74,12 +71,6 @@ public class TelegramBotAutoconfiguration { return new UnitPointerServiceImpl(unitPointerRepository); } - @Bean - @ConditionalOnBean(PersonSettingRepository.class) - public PersonSettingService personSettingService(PersonSettingRepository personSettingRepository) { - return new PersonSettingServiceImpl(personSettingRepository); - } - @Bean @ConditionalOnBean(TelegramConnect.class) public TelegramSending sending( @@ -128,14 +119,13 @@ public class TelegramBotAutoconfiguration { @ConditionalOnBean(name = "chatMailStorylineService") public ChatMailAutoresponderTelegram chatMailAutoresponderTelegram( @Qualifier(AUTORESPONDER_EXECUTORS_SERVICE) ObjectProvider executorServiceProvider, - PersonSettingService personSettingService, ObjectProvider errorHandlerProvider, ObjectProvider answerTextActionProvider, TelegramSending telegramSending, StorylineService storylineService ) { - final ChatMailAutoresponderTelegram autoresponder = new ChatMailAutoresponderTelegram(personSettingService, storylineService); + final ChatMailAutoresponderTelegram autoresponder = new ChatMailAutoresponderTelegram(storylineService); autoresponder.registrationActionUnit(new AnswerCheckAction(telegramSending)); autoresponder.registrationActionUnit(new AnswerSaveAction<>()); @@ -164,13 +154,12 @@ public class TelegramBotAutoconfiguration { public MailAutoresponderTelegram messageAutoresponderTelegram( @Qualifier(AUTORESPONDER_EXECUTORS_SERVICE) ObjectProvider executorServiceProvider, TelegramSending sending, - PersonSettingService personSettingService, ObjectProvider errorHandlerProvider, ObjectProvider answerTextActionProvider, StorylineService storylineService ) { - final MailAutoresponderTelegram autoresponder = new MailAutoresponderTelegram(personSettingService, storylineService); + final MailAutoresponderTelegram autoresponder = new MailAutoresponderTelegram(storylineService); autoresponder.registrationActionUnit(new AnswerCheckAction(sending)); autoresponder.registrationActionUnit(new AnswerSaveAction<>());