X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FEndlessConsumer.java;h=27c1e446cab68442bdf41ee6bb44baeb5c72e6c5;hb=66ff7d205e66616de8aaca94503dbbcd7d281f6d;hp=18cef23c16b96c723559f8bd79f6ad2106a41e16;hpb=014de600554a5f9ba620fdadb8581b5882bc4d20;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 18cef23..27c1e44 100644
--- a/src/main/java/de/juplo/kafka/EndlessConsumer.java
+++ b/src/main/java/de/juplo/kafka/EndlessConsumer.java
@@ -1,184 +1,102 @@
 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 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.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
+import org.springframework.kafka.annotation.KafkaHandler;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
+import org.springframework.kafka.support.KafkaHeaders;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.messaging.handler.annotation.Payload;
 
+import java.util.List;
+import java.util.Optional;
 
+
+@RequiredArgsConstructor
 @Slf4j
-public class EndlessConsumer implements Runnable
+@KafkaListener(
+    id = "${spring.kafka.client-id}",
+    idIsGroup = false,
+    topics = "${sumup.adder.topic}",
+    autoStartup = "false")
+public class EndlessConsumer
 {
-  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 RecordHandler recordHandler;
 
-  private final Lock lock = new ReentrantLock();
-  private final Condition condition = lock.newCondition();
-  private boolean running = false;
   private long consumed = 0;
-  private KafkaConsumer<String, String> consumer = null;
 
 
-  public EndlessConsumer(
-      ExecutorService executor,
-      String bootstrapServer,
-      String groupId,
-      String clientId,
-      String topic,
-      String autoOffsetReset)
+  @KafkaHandler
+  public void addNumber(
+    @Header(KafkaHeaders.RECEIVED_MESSAGE_KEY) String key,
+    @Header(KafkaHeaders.RECEIVED_TOPIC) String topic,
+    @Header(KafkaHeaders.RECEIVED_PARTITION_ID) Integer partition,
+    @Header(KafkaHeaders.OFFSET) Long offset,
+    @Payload MessageAddNumber message)
   {
-    this.executor = executor;
-    this.bootstrapServer = bootstrapServer;
-    this.groupId = groupId;
-    this.id = clientId;
-    this.topic = topic;
-    this.autoOffsetReset = autoOffsetReset;
+          log.info(
+              "{} - {}: {}/{} - {}={}",
+              id,
+              offset,
+              topic,
+              partition,
+              key,
+              message
+          );
+
+          recordHandler.addNumber(topic, partition, offset, key, message);
+
+          consumed++;
   }
 
-  @Override
-  public void run()
+  @KafkaHandler
+  public void calculateSum(
+    @Header(KafkaHeaders.RECEIVED_MESSAGE_KEY) String key,
+    @Header(KafkaHeaders.RECEIVED_TOPIC) String topic,
+    @Header(KafkaHeaders.RECEIVED_PARTITION_ID) Integer partition,
+    @Header(KafkaHeaders.OFFSET) Long offset,
+    @Payload MessageCalculateSum message)
   {
-    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("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));
-
-      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)
-        {
-          consumed++;
           log.info(
               "{} - {}: {}/{} - {}={}",
               id,
-              record.offset(),
-              record.topic(),
-              record.partition(),
-              record.key(),
-              record.value()
+              offset,
+              topic,
+              partition,
+              key,
+              message
           );
-        }
-      }
-    }
-    catch(WakeupException e)
-    {
-      log.info("{} - RIIING!", id);
-      shutdown();
-    }
-    catch(Exception e)
-    {
-      log.error("{} - Unexpected error: {}", id, e.toString(), e);
-      shutdown();
-    }
-    finally
-    {
-      log.info("{} - Closing the KafkaConsumer", id);
-      consumer.close();
-      log.info("{} - Consumer-Thread exiting", id);
-    }
-  }
 
-  private void shutdown()
-  {
-    lock.lock();
-    try
-    {
-      running = false;
-      condition.signal();
-    }
-    finally
-    {
-      lock.unlock();
-    }
+          recordHandler.calculateSum(topic, partition, offset, key, message);
+
+          consumed++;
   }
 
   public void start()
   {
-    lock.lock();
-    try
-    {
-      if (running)
-        throw new IllegalStateException("Consumer instance " + id + " is already running!");
-
-      log.info("{} - Starting - consumed {} messages before", id, consumed);
-      running = true;
-      executor.submit(this);
-    }
-    finally
-    {
-      lock.unlock();
-    }
+    if (running())
+      throw new IllegalStateException("Consumer instance " + id + " is already running!");
+
+    log.info("{} - Starting - consumed {} messages before", id, consumed);
+    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!");
+
+    log.info("{} - Stopping", id);
+    registry.getListenerContainer(id).stop();
+    log.info("{} - Stopped - consumed {} messages so far", id, consumed);
   }
 
-  @PreDestroy
-  public void destroy() throws ExecutionException, InterruptedException
+  public boolean running()
   {
-    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);
-    }
+    return registry.getListenerContainer(id).isRunning();
   }
 }