From 4fafc87547861485ef27b1e67c050c86f0bebdc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=B2?= <latypov@micord.ru>
Date: Tue, 17 Sep 2024 09:03:53 +0300
Subject: [PATCH] SUPPORT-8507: fix for review (1)

---
 .../config/output/OutputKafkaConsumerConfig.java  |  8 ++++----
 src/main/resources/application.properties         | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/ru/micord/ervu/av/kafka/config/output/OutputKafkaConsumerConfig.java b/src/main/java/ru/micord/ervu/av/kafka/config/output/OutputKafkaConsumerConfig.java
index 5588680..0204148 100644
--- a/src/main/java/ru/micord/ervu/av/kafka/config/output/OutputKafkaConsumerConfig.java
+++ b/src/main/java/ru/micord/ervu/av/kafka/config/output/OutputKafkaConsumerConfig.java
@@ -23,13 +23,13 @@ import org.springframework.kafka.listener.ContainerProperties;
 @Configuration
 @EnableKafka
 public class OutputKafkaConsumerConfig {
-  @Value("${spring.kafka.bootstrap-servers}")
+  @Value("${spring.kafka.out.bootstrap-servers}")
   private List<String> bootstrapAddress;
-  @Value("${spring.kafka.consumer.security.protocol}")
+  @Value("${spring.kafka.properties.security.protocol}")
   private String securityProtocol;
-  @Value("${spring.kafka.consumer.properties.sasl.jaas.config}")
+  @Value("${spring.kafka.properties.sasl.jaas.config}")
   private String jaasConfig;
-  @Value("${spring.kafka.consumer.properties.sasl.mechanism}")
+  @Value("${spring.kafka.properties.sasl.mechanism}")
   private String saslMechanism;
   @Value("${spring.kafka.consumer.enable-auto-commit}")
   private String enableAutoCommit;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 2238b29..0641b64 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,11 +1,12 @@
+# kafka out admin bean settings
 spring.kafka.admin.security.protocol=SASL_PLAINTEXT
 #login password to set
 spring.kafka.admin.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${OUT_KAFKA_USERNAME}" password="${OUT_KAFKA_PASSWORD}";
 spring.kafka.admin.properties.sasl.mechanism=SCRAM-SHA-256
-#
+# kafka out servers for admin bean
 #host1:port1, host2:port2
 spring.kafka.bootstrap-servers=${OUT_KAFKA_SERVERS}
-#
+# kafka in consumer
 #host1:port1, host2:port2
 spring.kafka.consumer.bootstrap-servers=${IN_KAFKA_SERVERS}
 spring.kafka.consumer.security.protocol=SASL_PLAINTEXT
@@ -15,17 +16,21 @@ spring.kafka.consumer.properties.sasl.mechanism=SCRAM-SHA-256
 #
 spring.kafka.consumer.enable-auto-commit=false
 spring.kafka.consumer.group-id=file-to-upload-consumers
+# kafka out consumer
 spring.kafka.out.consumer.group-id=response-consumers
-#
+# kafka out servers for consumer
+#host1:port1, host2:port2
+spring.kafka.out.bootstrap-servers=${OUT_KAFKA_SERVERS}
+# listeners
 spring.kafka.listener.ack-mode=MANUAL_IMMEDIATE
-#
+# kafka out producer
 #host1:port1, host2:port2
 spring.kafka.producer.bootstrap-servers=${OUT_KAFKA_SERVERS}
 spring.kafka.producer.security.protocol=SASL_PLAINTEXT
 #login password to set
 spring.kafka.producer.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${OUT_KAFKA_USERNAME}" password="${OUT_KAFKA_PASSWORD}";
 spring.kafka.producer.properties.sasl.mechanism=SCRAM-SHA-256
-#
+# kafka general
 spring.kafka.properties.security.protocol=SASL_PLAINTEXT
 #login password to set
 spring.kafka.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${OUT_KAFKA_USERNAME}" password="${OUT_KAFKA_PASSWORD}";