Merge pull request #1472 from folio-org/tmp-release-24.2.5

[CIRC-2085] Release 24.2.5
folio-org · Apr 30, 2024 · efa4789 · efa4789
2 parents 32866a3 + 8317c50
commit efa4789
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+## 24.2.5 2024-04-30
+
+* Fix Kafka configuration (CIRC-2037)
+
 ## 24.2.4 2024-04-23
 
 * Fix empty template token, 'chargeDate', in reminder notices (CIRC-2077)

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>mod-circulation</artifactId>
   <groupId>org.folio</groupId>
-  <version>24.2.5-SNAPSHOT</version>
+  <version>24.2.6-SNAPSHOT</version>
   <licenses>
     <license>
       <name>Apache License 2.0</name>

diff --git a/src/main/java/org/folio/circulation/EventConsumerVerticle.java b/src/main/java/org/folio/circulation/EventConsumerVerticle.java
@@ -85,7 +85,7 @@ private Future<Void> createConsumers() {
     return Future.all(List.of(
       createConsumer(CIRCULATION_RULES_UPDATED, new CirculationRulesUpdateEventHandler(),
         // puts consumers into separate groups so that they all receive the same event
-        new UniqueKafkaModuleIdProvider(vertx, kafkaConfig, CIRCULATION_RULES_UPDATED))
+        new UniqueKafkaModuleIdProvider(vertx, CIRCULATION_RULES_UPDATED))
     )).mapEmpty();
   }
 

diff --git a/src/main/java/org/folio/circulation/services/events/UniqueKafkaModuleIdProvider.java b/src/main/java/org/folio/circulation/services/events/UniqueKafkaModuleIdProvider.java
@@ -2,17 +2,16 @@
 
 import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.toMap;
-import static org.apache.kafka.clients.producer.ProducerConfig.BOOTSTRAP_SERVERS_CONFIG;
 import static org.folio.kafka.KafkaTopicNameHelper.formatGroupName;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
 
 import org.folio.circulation.domain.events.DomainEventType;
 import org.folio.kafka.KafkaConfig;
+import org.folio.kafka.services.KafkaEnvironmentProperties;
 
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
@@ -26,9 +25,14 @@ public class UniqueKafkaModuleIdProvider implements ModuleIdProvider {
   private final KafkaAdminClient kafkaAdminClient;
   private final DomainEventType eventType;
 
-  public UniqueKafkaModuleIdProvider(Vertx vertx, KafkaConfig kafkaConfig, DomainEventType eventType) {
-    Properties config = new Properties();
-    config.put(BOOTSTRAP_SERVERS_CONFIG, kafkaConfig.getKafkaUrl());
+  public UniqueKafkaModuleIdProvider(Vertx vertx, DomainEventType eventType) {
+    Map<String, String> config = KafkaConfig.builder()
+      .kafkaHost(KafkaEnvironmentProperties.host())
+      .kafkaPort(KafkaEnvironmentProperties.port())
+      .build()
+      .getProducerProps();
+
+    log.info("UniqueKafkaModuleIdProvider:: KafkaAdminClient config: {}", config);
 
     this.kafkaAdminClient = KafkaAdminClient.create(vertx, config);
     this.eventType = eventType;