From 4bf2cb09968cd3050f7c94b1a5960a465e6e35ff 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: Wed, 18 Sep 2024 07:29:58 +0300
Subject: [PATCH] SUPPORT-8507: fix for review (1.3)

---
 .../output/OutputKafkaConsumerConfig.java     |  8 ++---
 src/main/resources/application.properties     | 32 ++++++++++++-------
 2 files changed, 24 insertions(+), 16 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 fd1c008..397512c 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.out.bootstrap-servers}")
+  @Value("${spring.kafka.out.consumer.bootstrap-servers}")
   private List<String> bootstrapAddress;
-  @Value("${spring.kafka.properties.security.protocol}")
+  @Value("${spring.kafka.out.consumer.security.protocol}")
   private String securityProtocol;
-  @Value("${spring.kafka.properties.sasl.jaas.config}")
+  @Value("${spring.kafka.out.consumer.properties.sasl.jaas.config}")
   private String jaasConfig;
-  @Value("${spring.kafka.properties.sasl.mechanism}")
+  @Value("${spring.kafka.out.consumer.properties.sasl.mechanism}")
   private String saslMechanism;
   @Value("${spring.kafka.out.consumer.enable-auto-commit}")
   private String enableAutoCommit;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index cc0dac4..e411671 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,3 +1,4 @@
+# spring kafka default beans properties begin ->
 # kafka out admin bean settings
 spring.kafka.admin.security.protocol=SASL_PLAINTEXT
 #login password to set
@@ -7,7 +8,7 @@ spring.kafka.admin.properties.sasl.mechanism=SCRAM-SHA-256
 #host1:port1, host2:port2
 spring.kafka.bootstrap-servers=${OUT_KAFKA_SERVERS}
 #
-# kafka in consumer
+# kafka in consumer (with possibility for default bean)
 #host1:port1, host2:port2
 spring.kafka.consumer.bootstrap-servers=${IN_KAFKA_SERVERS}
 spring.kafka.consumer.security.protocol=SASL_PLAINTEXT
@@ -20,17 +21,7 @@ spring.kafka.consumer.group-id=file-to-upload-consumers
 # kafka in listeners
 spring.kafka.listener.ack-mode=MANUAL_IMMEDIATE
 #
-# kafka out consumer
-# kafka out servers for consumer
-#host1:port1, host2:port2
-spring.kafka.out.bootstrap-servers=${OUT_KAFKA_SERVERS}
-#
-spring.kafka.out.consumer.enable-auto-commit=false
-spring.kafka.out.consumer.group-id=response-consumers
-# kafka out listeners
-spring.kafka.out.listener.ack-mode=MANUAL_IMMEDIATE
-#
-# kafka out producer
+# kafka out producer (with possibility for default bean)
 #host1:port1, host2:port2
 spring.kafka.producer.bootstrap-servers=${OUT_KAFKA_SERVERS}
 spring.kafka.producer.security.protocol=SASL_PLAINTEXT
@@ -43,6 +34,21 @@ 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}";
 spring.kafka.properties.sasl.mechanism=SCRAM-SHA-256
+# spring kafka default beans properties <- end
+#
+# kafka out consumer (not for default bean creation by spring)
+#host1:port1, host2:port2
+spring.kafka.out.consumer.bootstrap-servers=${OUT_KAFKA_SERVERS}
+spring.kafka.out.consumer.security.protocol=SASL_PLAINTEXT
+#login password to set
+spring.kafka.out.consumer.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${OUT_KAFKA_USERNAME}" password="${OUT_KAFKA_PASSWORD}";
+spring.kafka.out.consumer.properties.sasl.mechanism=SCRAM-SHA-256
+#
+spring.kafka.out.consumer.enable-auto-commit=false
+spring.kafka.out.consumer.group-id=response-consumers
+# kafka out listeners
+spring.kafka.out.listener.ack-mode=MANUAL_IMMEDIATE
+#
 #
 kafka-in.topic.name=${IN_KAFKA_TOPIC_NAME}
 kafka-out.error.topic.name=${OUT_KAFKA_ERROR_TOPIC_NAME}
@@ -61,9 +67,11 @@ s3.out.access_key=${S3_ACCESS_KEY}
 s3.out.secret_key=${S3_SECRET_KEY}
 s3.out.bucket_name=${S3_OUT_BUCKET_NAME}
 #
+# spring jooq dsl bean properties begin ->
 spring.jooq.sql-dialect=Postgres
 spring.datasource.driver-class-name=org.postgresql.Driver
 #host:port/database_name
 spring.datasource.url=jdbc:postgresql://${SPRING_DATASOURCE_URL}
 spring.datasource.username=${SPRING_DATASOURCE_USERNAME}
 spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
+# spring jooq dsl bean properties <- end