diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java index 6bd1165c5..786fc475e 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java @@ -100,6 +100,7 @@ public class AccountService extends QueueConsumer implements InitializingBean { @Override public void afterPropertiesSet() { + imdgProvider.waitAvailable(); callback(CorrespondentAccountNewRequest.class) .setFunction(this::accountCorrespondentNew) .forDestination(Consts.DESTINATION_CORRESPONDENT_ACCOUNT_NEW, callbacks::put); diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClientCodeService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClientCodeService.java index 727b1483c..8a4f222f2 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClientCodeService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClientCodeService.java @@ -52,6 +52,7 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean private final Logger log = LoggerFactory.getLogger(getClass()); private final Producer kafkaProducer; private final ImdgId idGenerator; + private final ImdgProvider imdgProvider; private final Imdg clientCodeMap; private final Imdg tradingClearingRegistryMap; @@ -80,6 +81,7 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean @Qualifier("clientCodeDeleteRequestValidator") Function clientCodeDeleteRequestValidator) { super(kafkaQueue, kafkaProducer); this.kafkaProducer = kafkaProducer; + this.imdgProvider = imdgProvider; this.idGenerator = imdgProvider.getImdgIdGenerator(); this.clientCodeMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ClientCode, ClientCode.class); this.tradingClearingRegistryMap = imdgProvider.getImdg(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class); @@ -95,6 +97,8 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean @Override public void afterPropertiesSet() { + imdgProvider.waitAvailable(); + callback(ClientCodeNewRequest.class) .setFunction(this::clientCodeNew) .forDestination(Consts.DESTINATION_CLIENT_CODE_NEW, callbacks::put); diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java index ca10cdd66..701d367b3 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java @@ -52,6 +52,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini private final ValidationHelper validationHelper; private final UserRoleVerification userRoleVerification; + private final ImdgProvider imdgProvider; private final Imdg tradingClearingRegistryImdg; private final Imdg depoAccountImdg; private final Imdg clearingAccountImdg; @@ -90,9 +91,8 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini this.validationHelper = validationHelper; this.userRoleVerification = userRoleVerification; this.requestHelper = requestHelper; - this.tradingClearingRegistryImdg = imdgProvider.getImdg( - IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class - ); + this.imdgProvider = imdgProvider; + this.tradingClearingRegistryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class); this.depoAccountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_DepoAccount, DepoAccount.class); this.clearingAccountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingAccount, ClearingAccount.class); this.informationAccountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_InformationAccount, InformationAccount.class); @@ -108,6 +108,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini @Override public void afterPropertiesSet() throws Exception { + imdgProvider.waitAvailable(); callback(TradingClearingRegistryNewRequest.class) .setFunction(this::tradingClearingRegistryAutoNew) .forDestination(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_AUTO_NEW, callbacks::put);