`ExampleConsumer` über Generics typisiert

diff --git a/README.sh b/README.sh
index b46e2350c050bfe454921d2f305f64439d4fbcb2..a7cbb894146ec0e9a6bb40a9d011ba7661cdf748 100755 (executable)
--- a/README.sh
+++ b/README.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-IMAGE=juplo/spring-consumer:1.1-SNAPSHOT
+IMAGE=juplo/spring-consumer:1.1-generics-SNAPSHOT
 
 if [ "$1" = "cleanup" ]
 then

diff --git a/build.gradle b/build.gradle
index 6bc2bd9a67849f15366d1afc953465923bc06bc6..3ea1e79a8af0b1777bfba77d5cae84ac3e46c2a0 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = 'de.juplo.kafka'
-version = '1.0-SNAPSHOT'
+version = '1.1-generics-SNAPSHOT'
 
 java {
        toolchain {

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 2de43b8b43225722c1fb8650434a1884a4116aaf..b9c252afee9f2ebf25d900e7ff0b0b36f5c950fe 100644 (file)
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -180,7 +180,7 @@ services:
     mem_limit:  100m
 
   consumer:
-    image: juplo/spring-consumer:1.1-SNAPSHOT
+    image: juplo/spring-consumer:1.1-generics-SNAPSHOT
     environment:
       spring.kafka.bootstrap-servers: kafka:9092
       spring.kafka.client-id: consumer
@@ -189,7 +189,7 @@ services:
       juplo.consumer.topic: test
 
   peter:
-    image: juplo/spring-consumer:1.1-SNAPSHOT
+    image: juplo/spring-consumer:1.1-generics-SNAPSHOT
     environment:
       spring.kafka.bootstrap-servers: kafka:9092
       spring.kafka.client-id: consumer
@@ -198,7 +198,7 @@ services:
       juplo.consumer.topic: test
 
   ute:
-    image: juplo/spring-consumer:1.1-SNAPSHOT
+    image: juplo/spring-consumer:1.1-generics-SNAPSHOT
     environment:
       spring.kafka.bootstrap-servers: kafka:9092
       spring.kafka.client-id: consumer

diff --git a/pom.xml b/pom.xml
index ca365466bd4307c20227dde00772b86725884d7d..5017fffbbb7b41606c030ec9eee53809eddda01c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
   <artifactId>spring-consumer</artifactId>
   <name>Spring Consumer</name>
   <description>Super Simple Consumer-Group, that is implemented as Spring-Boot application and configured by Spring Kafka</description>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.1-generics-SNAPSHOT</version>
 
   <properties>
     <java.version>21</java.version>

diff --git a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
index 4ea8eee4fba3f90b33966b8e32b493eec1b0ee4b..efd5e3b9319b53049fa63434ed1cde1322a4e793 100644 (file)
--- a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@ -14,7 +14,7 @@ import org.springframework.kafka.core.ConsumerFactory;
 public class ApplicationConfiguration
 {
   @Bean
-  public ExampleConsumer exampleConsumer(
+  public ExampleConsumer<String, String> exampleConsumer(
     Consumer<String, String> kafkaConsumer,
     ApplicationProperties properties,
     KafkaProperties kafkaProperties,
@@ -22,7 +22,7 @@ public class ApplicationConfiguration
   {
     return
       new ExampleConsumer<>(
-        kafkaProperties.getClientId(),
+        properties.getClientId(),
         properties.getConsumerProperties().getTopic(),
         kafkaConsumer,
         () -> applicationContext.close());

diff --git a/src/main/java/de/juplo/kafka/ExampleConsumer.java b/src/main/java/de/juplo/kafka/ExampleConsumer.java
index 1f5a5706c875604947c467cd32611c4135c6a01e..101abd1c0b37e0c8bef761ebbfa44df71319cc94 100644 (file)
--- a/src/main/java/de/juplo/kafka/ExampleConsumer.java
+++ b/src/main/java/de/juplo/kafka/ExampleConsumer.java
@@ -11,11 +11,11 @@ import java.util.Arrays;
 
 
 @Slf4j
-public class ExampleConsumer implements Runnable
+public class ExampleConsumer<K, V> implements Runnable
 {
   private final String id;
   private final String topic;
-  private final Consumer<String, String> consumer;
+  private final Consumer<K, V> consumer;
   private final Thread workerThread;
   private final Runnable closeCallback;
 
@@ -25,7 +25,7 @@ public class ExampleConsumer implements Runnable
   public ExampleConsumer(
     String clientId,
     String topic,
-    Consumer<String, String> consumer,
+    Consumer<K, V> consumer,
     Runnable closeCallback)
   {
     this.id = clientId;
@@ -49,10 +49,10 @@ public class ExampleConsumer implements Runnable
 
       while (true)
       {
-        ConsumerRecords<String, String> records = consumer.poll(Duration.ofSeconds(1));
+        ConsumerRecords<K, V> records = consumer.poll(Duration.ofSeconds(1));
 
         log.info("{} - Received {} messages", id, records.count());
-        for (ConsumerRecord<String, String> record : records)
+        for (ConsumerRecord<K, V> record : records)
         {
           handleRecord(
             record.topic(),
@@ -86,8 +86,8 @@ public class ExampleConsumer implements Runnable
     String topic,
     Integer partition,
     Long offset,
-    String key,
-    String value)
+    K key,
+    V value)
   {
     consumed++;
     log.info("{} - partition={}-{}, offset={}: {}={}", id, topic, partition, offset, key, value);