From 36caec87be1aea7fb857913b9b2c940ef33d1249 Mon Sep 17 00:00:00 2001 From: aalehin Date: Thu, 15 Sep 2022 13:23:21 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-21=20---=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BB=20=D0=BF=D0=B5=D1=80=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= =?UTF-8?q?=20=D0=B2=20application.properties=20=D0=BF=D0=BE=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D1=81=D0=B8=D0=BB=20ConcurrentModificationException:=20K?= =?UTF-8?q?afkaConsumer=20is=20not=20safe=20for=20multi-threaded=20access?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/spcex/clearing/company/config/KafkaConfig.java | 3 +++ .../company/config/settings/CompanyServiceSettings.java | 2 +- .../company/service/ClearingMemberCategoryService.java | 3 ++- .../ru/spcex/clearing/company/service/CompanyInfoService.java | 3 ++- .../java/ru/spcex/clearing/company/service/CompanyService.java | 3 ++- .../spcex/clearing/company/service/CompanySymbolService.java | 3 ++- .../java/ru/spcex/clearing/company/service/ContactService.java | 3 ++- 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/KafkaConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/KafkaConfig.java index d63ecf6c5..5815678c4 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/KafkaConfig.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/KafkaConfig.java @@ -2,14 +2,17 @@ package ru.spcex.clearing.company.config; import org.apache.kafka.clients.consumer.Consumer; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import ru.spcex.clearing.company.config.settings.CompanyServiceSettings; import ru.spcex.clearing.platform.messaging.config.KafkaConsumerFactory; @Configuration public class KafkaConfig { @Autowired + @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) @Bean public Consumer createProducer(CompanyServiceSettings settings) { return KafkaConsumerFactory.consumer(settings.getKafka()); diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/settings/CompanyServiceSettings.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/settings/CompanyServiceSettings.java index 98f925d5f..e67bb2f8c 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/settings/CompanyServiceSettings.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/settings/CompanyServiceSettings.java @@ -8,7 +8,7 @@ import ru.spcex.platform.imdg.iml.hazelcast.config.HazelcastClientParams; @Component @PropertySource("file:${spring.config.location}/application.properties") -@ConfigurationProperties("utility-service") +@ConfigurationProperties("company-service") public class CompanyServiceSettings { private HazelcastClientParams hazelcast; private KafkaConsumerSettings kafka; diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java index dfb2ef84c..7ed87f27b 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java @@ -20,7 +20,8 @@ public class ClearingMemberCategoryService extends QueueConsumer implements Init private final Imdg clearingMemberCategoryMap; @Autowired - public ClearingMemberCategoryService(Consumer kafkaQueue, ImdgProvider imdgProvider) { + public ClearingMemberCategoryService(Consumer kafkaQueue, + ImdgProvider imdgProvider) { super(kafkaQueue); this.clearingMemberCategoryMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class); } diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java index 07c867578..72b9437e3 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java @@ -21,7 +21,8 @@ public class CompanyInfoService extends QueueConsumer implements InitializingBea private final Imdg companyInfoMap; @Autowired - public CompanyInfoService(Consumer kafkaQueue, ImdgProvider imdgProvider) { + public CompanyInfoService(Consumer kafkaQueue, + ImdgProvider imdgProvider) { super(kafkaQueue); this.companyInfoMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, CompanyInfo.class); } diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java index fc16ae75c..5a96460ac 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java @@ -21,7 +21,8 @@ public class CompanyService extends QueueConsumer implements InitializingBean { private final Imdg companyMap; @Autowired - public CompanyService(Consumer kafkaQueue, ImdgProvider imdgProvider) { + public CompanyService(Consumer kafkaQueue, + ImdgProvider imdgProvider) { super(kafkaQueue); this.companyMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); } diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanySymbolService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanySymbolService.java index c62cd502e..4a6f110af 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanySymbolService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanySymbolService.java @@ -22,7 +22,8 @@ public class CompanySymbolService extends QueueConsumer implements InitializingB private final Imdg companySymbolsMap; @Autowired - public CompanySymbolService(Consumer kafkaQueue, ImdgProvider imdgProvider) { + public CompanySymbolService(Consumer kafkaQueue, + ImdgProvider imdgProvider) { super(kafkaQueue); this.companySymbolsMap = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); } diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ContactService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ContactService.java index d96342ec1..0decc85f3 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ContactService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ContactService.java @@ -19,7 +19,8 @@ public class ContactService extends QueueConsumer implements InitializingBean { private final Imdg contactMap; @Autowired - public ContactService(Consumer kafkaQueue, ImdgProvider imdgProvider) { + public ContactService(Consumer kafkaQueue, + ImdgProvider imdgProvider) { super(kafkaQueue); this.contactMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Contact, Contact.class); }