From 705b7303780c6b8ca4514991d7ddea67bd927829 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Fri, 4 Jul 2025 15:55:25 +0300 Subject: [PATCH] =?UTF-8?q?EventReceiver,=20=D0=B2=D1=8B=D0=BF=D0=B8=D0=BB?= =?UTF-8?q?=D0=B8=D0=BB=20`continue=20session`=20=D1=81=D0=BE=D0=B1=D1=8B?= =?UTF-8?q?=D1=82=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D1=80=D1=8B=D1=85=20=D1=81=D0=B5=D1=81=D1=81=D0=B8=D0=B9-?= =?UTF-8?q?=D1=81=D0=B5=D1=80=D0=B2=D0=B8=D1=81=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clearing/service/EventsReceiver.java | 65 ++++--------------- .../factory/SessionStateMachineWrapper.java | 6 +- 2 files changed, 12 insertions(+), 59 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java index cb7500494..5fdf7e152 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java @@ -39,19 +39,8 @@ import ru.spcex.clearing.service.execution.ExecutionFondComponent; import ru.spcex.clearing.service.executors.Sdf06Executor; import ru.spcex.clearing.service.executors.Sdf10Executor; import ru.spcex.clearing.service.payment.PaymentInstructionOutboundService; -import ru.spcex.clearing.session.stage.CurrencySession; -import ru.spcex.clearing.session.stage.FinalMkrSession; -import ru.spcex.clearing.session.stage.IntermediateMkrSession; -import ru.spcex.clearing.session.stage.PaymSession; -import ru.spcex.clearing.session.stage.PrimaryAuctionB0Session; -import ru.spcex.clearing.session.stage.PrimaryAuctionBnSession; -import ru.spcex.clearing.session.stage.PrimaryAuctionT0Session; -import ru.spcex.clearing.session.stage.ReturnDepositSession; -import ru.spcex.clearing.session.stage.SecondaryAuctionT0Session; -import ru.spcex.clearing.session.stage.SessionManager; import ru.spcex.clearing.session.stage.SessionTerminator; import ru.spcex.clearing.session.stage.TaskType; -import ru.spcex.clearing.session.stage.UnitedSession; import ru.spcex.clearing.session.stage.impl.BalanceRevise; import ru.spcex.clearing.session.state.SsnEvent; import ru.spcex.clearing.session.state.factory.SessionStateMachineWrapper; @@ -67,17 +56,6 @@ public class EventsReceiver extends QueueConsumerV2 implements InitializingBean private final IMessageResolver errorResolver; private final ClearingService clearingService; private final RegistryService registryService; - private final PrimaryAuctionBnSession primaryAuctionBnSession; - private final PrimaryAuctionT0Session primaryAuctionT0Session; - private final SecondaryAuctionT0Session secondaryAuctionT0Session; - private final CurrencySession currencySession; - private final PrimaryAuctionB0Session primaryAuctionB0Session; - private final IntermediateMkrSession intermediateMkrSession; - private final FinalMkrSession finalMkrSession; - private final PaymSession paymSession; - private final UnitedSession unitedSession; - private final ReturnDepositSession returnDepositSession; - private final SessionManager sessionManager; private final SessionStateMachineWrapper stateMachineWrapper; private final Sdf06Executor sdf06Executor; private final Sdf10Executor sdf10Executor; @@ -95,28 +73,22 @@ public class EventsReceiver extends QueueConsumerV2 implements InitializingBean Environment environment, IMessageResolver errorResolver, ClearingService clearingService, RegistryService registryService, - PrimaryAuctionBnSession primaryAuctionBnSession, - SecondaryAuctionT0Session secondaryAuctionT0Session, - CurrencySession currencySession, - PrimaryAuctionB0Session primaryAuctionB0Session, PrimaryAuctionT0Session primaryAuctionT0Session, IntermediateMkrSession intermediateMkrSession, FinalMkrSession finalMkrSession, UnitedSession unitedSession, ReturnDepositSession returnDepositSession, PaymSession paymSession, SessionManager sessionManager, SessionStateMachineWrapper stateMachineWrapper, + SessionStateMachineWrapper stateMachineWrapper, Sdf06Executor sdf06Executor, - Sdf10Executor sdf10Executor, BalanceRevise balanceRevise, Sdf05Sender sdf05Sender, StatementServiceV2 statementService, SessionTerminator sessionTerminator, PaymentInstructionOutboundService pmtOutboundService, ExecutionCurrencyComponent execCurrUpload, ExecutionDepositComponent execDepUpload, ExecutionFondComponent execFondUpload) { + Sdf10Executor sdf10Executor, + BalanceRevise balanceRevise, + Sdf05Sender sdf05Sender, + StatementServiceV2 statementService, + SessionTerminator sessionTerminator, + PaymentInstructionOutboundService pmtOutboundService, + ExecutionCurrencyComponent execCurrUpload, + ExecutionDepositComponent execDepUpload, + ExecutionFondComponent execFondUpload) { super(kafkaQueue, kafkaResponseQueue); this.environment = environment; this.errorResolver = errorResolver; this.clearingService = clearingService; this.registryService = registryService; - this.primaryAuctionBnSession = primaryAuctionBnSession; - this.secondaryAuctionT0Session = secondaryAuctionT0Session; - this.currencySession = currencySession; - this.primaryAuctionB0Session = primaryAuctionB0Session; - this.primaryAuctionT0Session = primaryAuctionT0Session; - this.intermediateMkrSession = intermediateMkrSession; - this.finalMkrSession = finalMkrSession; - this.paymSession = paymSession; - this.unitedSession = unitedSession; - this.returnDepositSession = returnDepositSession; - this.sessionManager = sessionManager; this.stateMachineWrapper = stateMachineWrapper; this.sdf06Executor = sdf06Executor; this.sdf10Executor = sdf10Executor; @@ -153,12 +125,7 @@ public class EventsReceiver extends QueueConsumerV2 implements InitializingBean callback(LauncherCommandRequest.class) .setFunction(r -> { - try { - sessionManager.defineAndStartSession(r); - stateMachineWrapper.defineAndStartSession(r); - } catch (ValidationException ve) { - return makeErrorResponse(r, ve); - } + stateMachineWrapper.defineAndStartSession(r); return null; }) .forDestination(Task.startOfClearing.topic(), callbacks::put); @@ -174,16 +141,6 @@ public class EventsReceiver extends QueueConsumerV2 implements InitializingBean .forDestination(Consts.STATEMENT_PROCESS, callbacks::put); callback(SessionContinueEvent.class) .setConsumer(req -> { - primaryAuctionBnSession.continueSession(req); - primaryAuctionT0Session.continueSession(req); - secondaryAuctionT0Session.continueSession(req); - currencySession.continueSession(req); - primaryAuctionB0Session.continueSession(req); - intermediateMkrSession.continueSession(req); - //finalMkrSession.continueSession(req); - unitedSession.continueSession(req); - returnDepositSession.continueSession(req); - paymSession.continueSession(req); SessionContinueEvent payload = req.getRequestPayload(); Stream .ofNullable(payload.getSdfType()) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/factory/SessionStateMachineWrapper.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/factory/SessionStateMachineWrapper.java index b425cc6b4..087553f97 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/factory/SessionStateMachineWrapper.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/factory/SessionStateMachineWrapper.java @@ -100,11 +100,7 @@ public class SessionStateMachineWrapper { } private StateMachineFactory getByType(SessionType sessionType) { - StateMachineFactory factory = factories.get(sessionType); - //if (factory == null) { - // throw new NoSuchElementException("no state machine for session: " + sessionType); - //} - return factory; + return factories.get(sessionType); }