From 5333009c51a9cd5439f2cf76d9319a68bf6638fd Mon Sep 17 00:00:00 2001 From: gulnaz Date: Wed, 11 Sep 2024 08:38:51 +0300 Subject: [PATCH] SUPPORT-8411: rename topic properties --- .../grid/impl/JournalInMemoryStaticGridLoadService.java | 8 ++++++-- .../java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java | 2 +- config/patches/default.cli | 5 ++--- config/standalone/dev/standalone.xml | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/ervu/service/grid/impl/JournalInMemoryStaticGridLoadService.java b/backend/src/main/java/ervu/service/grid/impl/JournalInMemoryStaticGridLoadService.java index 3e559fc7..a0a92cbd 100644 --- a/backend/src/main/java/ervu/service/grid/impl/JournalInMemoryStaticGridLoadService.java +++ b/backend/src/main/java/ervu/service/grid/impl/JournalInMemoryStaticGridLoadService.java @@ -27,14 +27,18 @@ public class JournalInMemoryStaticGridLoadService implements @Autowired private JwtTokenService jwtTokenService; + @Autowired @Qualifier("journal") private ReplyingKafkaService ervuReplyingKafkaService; + @Autowired private ObjectMapper objectMapper; - @Value("${ervu-journal-kafka.request-topic}") + + @Value("${ervu-kafka.journal-request-topic}") private String requestTopic; - @Value("${ervu-journal-kafka.reply-topic}") + + @Value("${ervu-kafka.journal-reply-topic}") private String replyTopic; @Override diff --git a/backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java b/backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java index e3c67ff9..766b4b05 100644 --- a/backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java +++ b/backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java @@ -32,7 +32,7 @@ public class ReplyingKafkaConfig { @Value("${ervu-kafka.org-reply-topic}") private String orgReplyTopic; - @Value("${ervu-journal-kafka.reply-topic}") + @Value("${ervu-kafka.journal-reply-topic}") private String journalReplyTopic; @Value("${ervu-kafka.group-id}") diff --git a/config/patches/default.cli b/config/patches/default.cli index 63c71849..d4a81189 100644 --- a/config/patches/default.cli +++ b/config/patches/default.cli @@ -58,6 +58,5 @@ xa-data-source add \ /system-property=ervu.cron.load.enable(value="true") /system-property=ervu.cron.load.time(value="0 0 */1 * * *") /system-property=ervu.esnsi.classifier.url.load(value="https://esnsi.gosuslugi.ru/rest/ext/v1/classifiers/11465/file?extension=JSON&encoding=UTF_8"") -/system-property=ervu-kafka.request-topic:add(value="ervu.organization.request") -/system-property=ervu-journal-kafka.request-topic:add(value="ervu.organization.journal.request") -/system-property=ervu-journal-kafka.reply-topic:add(value="ervu.organization.journal.response") +/system-property=ervu-kafka.journal-request-topic:add(value="ervu.organization.journal.request") +/system-property=ervu-kafka.journal-reply-topic:add(value="ervu.organization.journal.response") diff --git a/config/standalone/dev/standalone.xml b/config/standalone/dev/standalone.xml index 9cb97257..ea639dfa 100644 --- a/config/standalone/dev/standalone.xml +++ b/config/standalone/dev/standalone.xml @@ -84,8 +84,8 @@ - - + +