X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FEndlessConsumer.java;h=d3d11ae976ae268527503aa2611328814c27d0a4;hb=f095f71a104fcde025a63f87ba75eb5cb3136656;hp=22dce95ee17a7c6c9f089bbe5e9377fe8bdcdba3;hpb=e87f4bb2bc188252955fb4932ddd99161ba621d3;p=demos%2Fkafka%2Ftraining

diff --git a/src/main/java/de/juplo/kafka/EndlessConsumer.java b/src/main/java/de/juplo/kafka/EndlessConsumer.java
index 22dce95..d3d11ae 100644
--- a/src/main/java/de/juplo/kafka/EndlessConsumer.java
+++ b/src/main/java/de/juplo/kafka/EndlessConsumer.java
@@ -1,78 +1,39 @@
 package de.juplo.kafka;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.common.errors.WakeupException;
-import org.apache.kafka.common.serialization.StringDeserializer;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
 
-import javax.annotation.PreDestroy;
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.Properties;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.List;
+import java.util.Optional;
 
 
+@RequiredArgsConstructor
 @Slf4j
-public class EndlessConsumer implements Runnable
+public class EndlessConsumer<K, V>
 {
-  private final ExecutorService executor;
-  private final String bootstrapServer;
-  private final String groupId;
   private final String id;
-  private final String topic;
+  private final KafkaListenerEndpointRegistry registry;
+  private final ApplicationErrorHandler errorHandler;
+  private final RecordHandler<K, V> recordHandler;
 
-  private AtomicBoolean running = new AtomicBoolean();
   private long consumed = 0;
-  private KafkaConsumer<String, String> consumer = null;
-  private Future<?> future = null;
-
-  public EndlessConsumer(
-      ExecutorService executor,
-      String bootstrapServer,
-      String groupId,
-      String clientId,
-      String topic)
-  {
-    this.executor = executor;
-    this.bootstrapServer = bootstrapServer;
-    this.groupId = groupId;
-    this.id = clientId;
-    this.topic = topic;
-  }
 
-  @Override
-  public void run()
-  {
-    Properties props = new Properties();
-    props.put("bootstrap.servers", bootstrapServer);
-    props.put("group.id", groupId);
-    props.put("client.id", id);
-    props.put("auto.offset.reset", "earliest");
-    props.put("key.deserializer", StringDeserializer.class.getName());
-    props.put("value.deserializer", StringDeserializer.class.getName());
-
-    this.consumer = new KafkaConsumer<>(props);
-
-    try
-    {
-      log.info("{} - Subscribing to topic {}", id, topic);
-      consumer.subscribe(Arrays.asList(topic));
-
-      while (true)
-      {
-        ConsumerRecords<String, String> records =
-            consumer.poll(Duration.ofSeconds(1));
 
+  @KafkaListener(
+      id = "${spring.kafka.client-id}",
+      idIsGroup = false,
+      topics = "${sumup.adder.topic}",
+      batch = "true",
+      autoStartup = "false")
+  public void accept(List<ConsumerRecord<K, V>> records)
+  {
         // Do something with the data...
-        log.info("{} - Received {} messages", id, records.count());
-        for (ConsumerRecord<String, String> record : records)
+        log.info("{} - Received {} messages", id, records.size());
+        for (ConsumerRecord<K, V> record : records)
         {
-          consumed++;
           log.info(
               "{} - {}: {}/{} - {}={}",
               id,
@@ -82,64 +43,43 @@ public class EndlessConsumer implements Runnable
               record.key(),
               record.value()
           );
+
+          recordHandler.accept(record);
+
+          consumed++;
         }
-      }
-    }
-    catch(WakeupException e)
-    {
-      log.info("{} - RIIING!", id);
-    }
-    catch(Exception e)
-    {
-      log.error("{} - Unexpected error: {}", id, e.toString());
-      running.set(false); // Mark the instance as not running
-    }
-    finally
-    {
-      log.info("{} - Closing the KafkaConsumer", id);
-      consumer.close();
-      log.info("{} - Consumer-Thread exiting", id);
-    }
   }
 
-
-  public synchronized void start()
+  public void start()
   {
-    boolean stateChanged = running.compareAndSet(false, true);
-    if (!stateChanged)
-      throw new RuntimeException("Consumer instance " + id + " is already running!");
+    if (running())
+      throw new IllegalStateException("Consumer instance " + id + " is already running!");
 
     log.info("{} - Starting - consumed {} messages before", id, consumed);
-    future = executor.submit(this);
+    errorHandler.clearState();
+    registry.getListenerContainer(id).start();
   }
 
-  public synchronized void stop() throws ExecutionException, InterruptedException
+  public void stop()
   {
-    boolean stateChanged = running.compareAndSet(true, false);
-    if (!stateChanged)
-      throw new RuntimeException("Consumer instance " + id + " is not running!");
+    if (!running())
+      throw new IllegalStateException("Consumer instance " + id + " is not running!");
 
     log.info("{} - Stopping", id);
-    consumer.wakeup();
-    future.get();
+    registry.getListenerContainer(id).stop();
     log.info("{} - Stopped - consumed {} messages so far", id, consumed);
   }
 
-  @PreDestroy
-  public void destroy() throws ExecutionException, InterruptedException
+  public boolean running()
+  {
+    return registry.getListenerContainer(id).isRunning();
+  }
+
+  public Optional<Exception> exitStatus()
   {
-    log.info("{} - Destroy!", id);
-    try
-    {
-      stop();
-    }
-    catch (IllegalStateException e)
-    {
-      log.info("{} - Was already stopped", id);
-    }
-    finally
-    {
-      log.info("{}: Consumed {} messages in total, exiting!", id, consumed);
-    }
+    if (running())
+      throw new IllegalStateException("No exit-status available: Consumer instance " + id + " is running!");
+
+    return errorHandler.getException();
   }
 }