X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FEndlessConsumer.java;h=d3d11ae976ae268527503aa2611328814c27d0a4;hb=f095f71a104fcde025a63f87ba75eb5cb3136656;hp=2310ccd7fe7306f4b0e7f5f5081fdd16c5846380;hpb=f9c0ba7779552d8fcfc9cb29c8b689e20c314904;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 2310ccd..d3d11ae 100644
--- a/src/main/java/de/juplo/kafka/EndlessConsumer.java
+++ b/src/main/java/de/juplo/kafka/EndlessConsumer.java
@@ -1,94 +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.HashMap;
-import java.util.Map;
+import java.util.List;
 import java.util.Optional;
-import java.util.Properties;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 
+@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 String autoOffsetReset;
+  private final KafkaListenerEndpointRegistry registry;
+  private final ApplicationErrorHandler errorHandler;
+  private final RecordHandler<K, V> recordHandler;
 
-  private final Lock lock = new ReentrantLock();
-  private final Condition condition = lock.newCondition();
-  private boolean running = false;
-  private Exception exception;
   private long consumed = 0;
-  private KafkaConsumer<String, String> consumer = null;
 
 
-  private Map<Integer, Map<String, Integer>> seen;
-
-
-  public EndlessConsumer(
-      ExecutorService executor,
-      String bootstrapServer,
-      String groupId,
-      String clientId,
-      String topic,
-      String autoOffsetReset)
-  {
-    this.executor = executor;
-    this.bootstrapServer = bootstrapServer;
-    this.groupId = groupId;
-    this.id = clientId;
-    this.topic = topic;
-    this.autoOffsetReset = autoOffsetReset;
-  }
-
-  @Override
-  public void run()
+  @KafkaListener(
+      id = "${spring.kafka.client-id}",
+      idIsGroup = false,
+      topics = "${sumup.adder.topic}",
+      batch = "true",
+      autoStartup = "false")
+  public void accept(List<ConsumerRecord<K, V>> records)
   {
-    try
-    {
-      Properties props = new Properties();
-      props.put("bootstrap.servers", bootstrapServer);
-      props.put("group.id", groupId);
-      props.put("client.id", id);
-      props.put("auto.offset.reset", autoOffsetReset);
-      props.put("metadata.max.age.ms", "1000");
-      props.put("key.deserializer", StringDeserializer.class.getName());
-      props.put("value.deserializer", StringDeserializer.class.getName());
-
-      this.consumer = new KafkaConsumer<>(props);
-
-      log.info("{} - Subscribing to topic {}", id, topic);
-      consumer.subscribe(Arrays.asList(topic));
-
-      seen = new HashMap<>();
-
-      while (true)
-      {
-        ConsumerRecords<String, String> records =
-            consumer.poll(Duration.ofSeconds(1));
-
         // 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,
@@ -99,168 +44,42 @@ public class EndlessConsumer implements Runnable
               record.value()
           );
 
-          Integer partition = record.partition();
-          String key = record.key() == null ? "NULL" : record.key();
-
-          if (!seen.containsKey(partition))
-            seen.put(partition, new HashMap<>());
-
-          Map<String, Integer> byKey = seen.get(partition);
+          recordHandler.accept(record);
 
-          if (!byKey.containsKey(key))
-            byKey.put(key, 0);
-
-          int seenByKey = byKey.get(key);
-          seenByKey++;
-          byKey.put(key, seenByKey);
-        }
-      }
-    }
-    catch(WakeupException e)
-    {
-      log.info("{} - RIIING!", id);
-      shutdown();
-    }
-    catch(Exception e)
-    {
-      log.error("{} - Unexpected error: {}", id, e.toString(), e);
-      shutdown(e);
-    }
-    finally
-    {
-      log.info("{} - Closing the KafkaConsumer", id);
-      consumer.close();
-
-      for (Integer partition : seen.keySet())
-      {
-        Map<String, Integer> byKey = seen.get(partition);
-        for (String key : byKey.keySet())
-        {
-          log.info(
-              "{} - Seen {} messages for partition={}|key={}",
-              id,
-              byKey.get(key),
-              partition,
-              key);
+          consumed++;
         }
-      }
-      seen = null;
-
-      log.info("{} - Consumer-Thread exiting", id);
-    }
-  }
-
-  public Map<Integer, Map<String, Integer>> getSeen()
-  {
-    return seen;
-  }
-
-  private void shutdown()
-  {
-    shutdown(null);
-  }
-
-  private void shutdown(Exception e)
-  {
-    lock.lock();
-    try
-    {
-      running = false;
-      exception = e;
-      condition.signal();
-    }
-    finally
-    {
-      lock.unlock();
-    }
   }
 
   public void start()
   {
-    lock.lock();
-    try
-    {
-      if (running)
-        throw new IllegalStateException("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);
-      running = true;
-      exception = null;
-      executor.submit(this);
-    }
-    finally
-    {
-      lock.unlock();
-    }
+    log.info("{} - Starting - consumed {} messages before", id, consumed);
+    errorHandler.clearState();
+    registry.getListenerContainer(id).start();
   }
 
-  public synchronized void stop() throws ExecutionException, InterruptedException
+  public void stop()
   {
-    lock.lock();
-    try
-    {
-      if (!running)
-        throw new IllegalStateException("Consumer instance " + id + " is not running!");
-
-      log.info("{} - Stopping", id);
-      consumer.wakeup();
-      condition.await();
-      log.info("{} - Stopped - consumed {} messages so far", id, consumed);
-    }
-    finally
-    {
-      lock.unlock();
-    }
-  }
+    if (!running())
+      throw new IllegalStateException("Consumer instance " + id + " is not running!");
 
-  @PreDestroy
-  public void destroy() throws ExecutionException, InterruptedException
-  {
-    log.info("{} - Destroy!", id);
-    try
-    {
-      stop();
-    }
-    catch (IllegalStateException e)
-    {
-      log.info("{} - Was already stopped", id);
-    }
-    catch (Exception e)
-    {
-      log.error("{} - Unexpected exception while trying to stop the consumer", id, e);
-    }
-    finally
-    {
-      log.info("{}: Consumed {} messages in total, exiting!", id, consumed);
-    }
+    log.info("{} - Stopping", id);
+    registry.getListenerContainer(id).stop();
+    log.info("{} - Stopped - consumed {} messages so far", id, consumed);
   }
 
   public boolean running()
   {
-    lock.lock();
-    try
-    {
-      return running;
-    }
-    finally
-    {
-      lock.unlock();
-    }
+    return registry.getListenerContainer(id).isRunning();
   }
 
   public Optional<Exception> exitStatus()
   {
-    lock.lock();
-    try
-    {
-      if (running)
-        throw new IllegalStateException("No exit-status available: Consumer instance " + id + " is running!");
+    if (running())
+      throw new IllegalStateException("No exit-status available: Consumer instance " + id + " is running!");
 
-      return Optional.ofNullable(exception);
-    }
-    finally
-    {
-      lock.unlock();
-    }
+    return errorHandler.getException();
   }
 }