`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 1f688cfef673cd0ca42ac4c066a74af289da2c6c..3f628abf8b5150686a53de49cf30ac6317b3d3bc 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = 'de.juplo.kafka'
-version = '1.1-SNAPSHOT'
+version = '1.1-generics-SNAPSHOT'
 
 java {
        toolchain {

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index c969c1ff92884aa9cfa04ade5c6ab4e3955c6c4a..98c5fdf809b77d55d90dd13f8d56effacec1b18c 100644 (file)
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -180,21 +180,21 @@ services:
     mem_limit:  100m
 
   consumer:
-    image: juplo/spring-consumer:1.1-SNAPSHOT
+    image: juplo/spring-consumer:1.1-generics-SNAPSHOT
     environment:
       juplo.bootstrap-server: kafka:9092
       juplo.client-id: consumer
       juplo.consumer.topic: test
 
   peter:
-    image: juplo/spring-consumer:1.1-SNAPSHOT
+    image: juplo/spring-consumer:1.1-generics-SNAPSHOT
     environment:
       juplo.bootstrap-server: kafka:9092
       juplo.client-id: peter
       juplo.consumer.topic: test
 
   ute:
-    image: juplo/spring-consumer:1.1-SNAPSHOT
+    image: juplo/spring-consumer:1.1-generics-SNAPSHOT
     environment:
       juplo.bootstrap-server: kafka:9092
       juplo.client-id: ute

diff --git a/pom.xml b/pom.xml
index d8d234df8cfa87a32aa3762598ea57cbd9ad6dba..72ecbf16c8174d91682441528d489631b14c42cf 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.1-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 a45c1505d4697303b999cba64acac0a32d0f16e9..b41cea5eed46a7e380b90c13ea09cef5e42e8468 100644 (file)
--- a/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/ApplicationConfiguration.java
@@ -16,13 +16,13 @@ import java.util.Properties;
 public class ApplicationConfiguration
 {
   @Bean
-  public ExampleConsumer exampleConsumer(
+  public ExampleConsumer<String, String> exampleConsumer(
     Consumer<String, String> kafkaConsumer,
     ApplicationProperties properties,
     ConfigurableApplicationContext applicationContext)
   {
     return
-      new ExampleConsumer(
+      new ExampleConsumer<>(
         properties.getClientId(),
         properties.getConsumerProperties().getTopic(),
         kafkaConsumer);

diff --git a/src/main/java/de/juplo/kafka/ExampleConsumer.java b/src/main/java/de/juplo/kafka/ExampleConsumer.java
index 0c06b10f29d6ebe9d802df5b02e476cd9614efd4..f33686412414f056ade913780707d91b812273b9 100644 (file)
--- a/src/main/java/de/juplo/kafka/ExampleConsumer.java
+++ b/src/main/java/de/juplo/kafka/ExampleConsumer.java
@@ -12,11 +12,11 @@ import java.util.Arrays;
 
 
 @Slf4j
-public class ExampleConsumer implements Runnable, SmartLifecycle
+public class ExampleConsumer<K, V> implements Runnable, SmartLifecycle
 {
   private final String id;
   private final String topic;
-  private final Consumer<String, String> consumer;
+  private final Consumer<K, V> consumer;
 
   private Thread workerThread;
   private volatile boolean running = false;
@@ -26,7 +26,7 @@ public class ExampleConsumer implements Runnable, SmartLifecycle
   public ExampleConsumer(
     String clientId,
     String topic,
-    Consumer<String, String> consumer)
+    Consumer<K, V> consumer)
   {
     this.id = clientId;
     this.topic = topic;
@@ -57,10 +57,10 @@ public class ExampleConsumer implements Runnable, SmartLifecycle
 
       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(),
@@ -92,8 +92,8 @@ public class ExampleConsumer implements Runnable, SmartLifecycle
     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);