From fefd935e4537aece18165159d1a9c639352defc4 Mon Sep 17 00:00:00 2001 From: aalehin Date: Mon, 3 Oct 2022 11:37:00 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-21 --- fix-up --- .../clearing/company/config/KafkaConfig.java | 2 +- .../company/service/CompanyService.java | 2 +- .../clearing/imdg/IMDGDistributedNames.java | 17 ++++++----------- 3 files changed, 8 insertions(+), 13 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 5815678c4..6ce4bca40 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 @@ -14,7 +14,7 @@ public class KafkaConfig { @Autowired @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) @Bean - public Consumer createProducer(CompanyServiceSettings settings) { + public Consumer createConsumer(CompanyServiceSettings settings) { return KafkaConsumerFactory.consumer(settings.getKafka()); } } 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 5a96460ac..32857ac80 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 @@ -24,7 +24,7 @@ public class CompanyService extends QueueConsumer implements InitializingBean { public CompanyService(Consumer kafkaQueue, ImdgProvider imdgProvider) { super(kafkaQueue); - this.companyMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); + this.companyMap = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanyInfo, Company.class); } @Override diff --git a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java index 91361002c..ea63c6480 100644 --- a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java +++ b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java @@ -4,14 +4,11 @@ package ru.spcex.clearing.imdg; * Список имён распределённых объектов */ public final class IMDGDistributedNames { - private IMDGDistributedNames() { - } - public static final String Map_Company = "Map_Company"; public static final String Map_CompanyHistory = "Map_CompanyHistory"; public static final String Map_CompanyRoleSet = "Map_CompanyRoleSet"; public static final String Map_CompanySymbols = "Map_CompanySymbols"; - // public static final String Map_CompanyInfo = "Map_CompanyInfo"; интегрировано в Map_Company + public static final String Map_CompanyInfo = "Map_CompanyInfo"; public static final String Map_Contact = "Map_Contact"; public static final String Map_ProfileDocument = "Map_ProfileDocument"; public static final String Map_Account = "Map_Account"; @@ -43,7 +40,6 @@ public final class IMDGDistributedNames { public static final String Map_Timetable = "Map_Timetable"; public static final String Map_InDocumentJournal = "Map_InDocumentJournal"; public static final String Map_OutDocumentJournal = "Map_OutDocumentJournal"; - public static final String Map_SDf01 = "Map_SDf01"; public static final String Map_SDf02 = "Map_SDf02"; public static final String Map_SDf03 = "Map_SDf03"; @@ -58,10 +54,9 @@ public final class IMDGDistributedNames { public static final String Map_SDf09 = "Map_SDf09"; public static final String Map_SDf12 = "Map_SDf12"; public static final String Map_SDf18 = "Map_SDf18"; - -// public static final String Map_InterestStatusDictionary = "Map_InterestStatusDictionary"; future + // public static final String Map_InterestStatusDictionary = "Map_InterestStatusDictionary"; future public static final String Map_AllowedDictionary = "Map_AllowedDictionary"; -// public static final String Map_ClearingMemberCategoryDictionary = "Map_ClearingMemberCategoryDictionary"; future + // public static final String Map_ClearingMemberCategoryDictionary = "Map_ClearingMemberCategoryDictionary"; future public static final String Map_CompanyRoleDictionary = "Map_CompanyRoleDictionary"; public static final String Map_CompanySymbolDictionary = "Map_CompanySymbolDictionary"; public static final String Map_ContactTypeDictionary = "Map_ContactTypeDictionary"; @@ -103,11 +98,11 @@ public final class IMDGDistributedNames { public static final String Map_UserSettings = "Map_UserSettings"; public static final String Map_UserRoleSession = "Map_UserRoleSession"; public static final String Map_AccountStatusDictionary = "Map_AccountStatusDictionary"; - public static final String Map_KeyRate = "Map_KeyRate"; public static final String Map_MoneyMarketSecurity = "Map_MoneyMarketSecurity"; - public static final String Map_AccountBalance = "Map_AccountBalance"; - public static final String MAP_SEQUENCE_NAME = "MAP_SEQUENCE_NAME"; // todo вынести idGenerator отдельно и завернуть в метод, чтобы не напрямую обращаться. + + private IMDGDistributedNames() { + } }