Addder beendet sich bei Fehler und Logik für Beenden vereinfacht

[demos/kafka/training] / src / main / java / de / juplo / kafka / EndlessConsumer.java

diff --git a/src/main/java/de/juplo/kafka/EndlessConsumer.java b/src/main/java/de/juplo/kafka/EndlessConsumer.java
index 00678c4..9ea944b 100644 (file)
--- a/src/main/java/de/juplo/kafka/EndlessConsumer.java
+++ b/src/main/java/de/juplo/kafka/EndlessConsumer.java
@@ -6,15 +6,11 @@ import org.apache.kafka.clients.consumer.*;
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.errors.RecordDeserializationException;
 import org.apache.kafka.common.errors.WakeupException;
+import org.springframework.context.ConfigurableApplicationContext;
 
-import javax.annotation.PreDestroy;
 import java.time.Duration;
 import java.util.*;
-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;
 
 
 @Slf4j
@@ -22,16 +18,15 @@ import java.util.concurrent.locks.ReentrantLock;
 public class EndlessConsumer<K, V> implements Runnable
 {
   private final ExecutorService executor;
+  private final ConfigurableApplicationContext applicationContext;
   private final String id;
   private final String topic;
   private final Consumer<K, V> consumer;
   private final ConsumerRebalanceListener rebalanceListener;
   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 Exception exception = null;
   private long consumed = 0;
 
 
@@ -72,8 +67,6 @@ public class EndlessConsumer<K, V> implements Runnable
     catch(WakeupException e)
     {
       log.info("{} - RIIING! Request to stop consumption - commiting current offsets!", id);
-      consumer.commitSync();
-      shutdown();
     }
     catch(RecordDeserializationException e)
     {
@@ -85,128 +78,50 @@ public class EndlessConsumer<K, V> implements Runnable
           tp,
           offset,
           e.getCause().toString());
-
-      consumer.commitSync();
-      shutdown(e);
+      this.exception = e;
     }
     catch(Exception e)
     {
       log.error("{} - Unexpected error: {}", id, e.toString(), e);
-      shutdown(e);
+      this.exception = e;
+      log.info("{} - Unsubscribing...", id);
+      consumer.unsubscribe();
     }
     finally
     {
+      running = false;
+      log.info("{} - Closing the consumer...", id);
+      consumer.close();
+      log.info("{} - Shutting down the app...", id);
+      applicationContext.close();
       log.info("{} - Consumer-Thread exiting", id);
     }
   }
 
-  private void shutdown()
-  {
-    shutdown(null);
-  }
-
-  private void shutdown(Exception e)
-  {
-    lock.lock();
-    try
-    {
-      try
-      {
-        log.info("{} - Unsubscribing from topic {}", id, topic);
-        consumer.unsubscribe();
-      }
-      catch (Exception ue)
-      {
-        log.error(
-            "{} - Error while unsubscribing from topic {}: {}",
-            id,
-            topic,
-            ue.toString());
-      }
-      finally
-      {
-        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!");
-
-      log.info("{} - Starting - consumed {} messages before", id, consumed);
-      running = true;
-      exception = null;
-      executor.submit(this);
-    }
-    finally
-    {
-      lock.unlock();
-    }
-  }
-
-  public synchronized void stop() throws InterruptedException
-  {
-    lock.lock();
-    try
-    {
-      if (!running)
-        throw new IllegalStateException("Consumer instance " + id + " is not running!");
+    if (running)
+      throw new IllegalStateException("Consumer instance " + id + " is already running!");
 
-      log.info("{} - Stopping", id);
-      consumer.wakeup();
-      condition.await();
-      log.info("{} - Stopped - consumed {} messages so far", id, consumed);
-    }
-    finally
-    {
-      lock.unlock();
-    }
+    log.info("{} - Starting - consumed {} messages before", id, consumed);
+    running = true;
+    executor.submit(this);
   }
 
-  @PreDestroy
-  public void destroy() throws ExecutionException, InterruptedException
+  public void stop()
   {
-    log.info("{} - Destroy!", id);
-    log.info("{}: Consumed {} messages in total, exiting!", id, consumed);
+    consumer.wakeup();
   }
-
   public boolean running()
   {
-    lock.lock();
-    try
-    {
-      return running;
-    }
-    finally
-    {
-      lock.unlock();
-    }
+    return running;
   }
 
   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 Optional.ofNullable(exception);
   }
 }