Gesehene Schlüssel sollten als long gezählt werden

[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 03a89dc..bc3d357 100644 (file)
--- a/src/main/java/de/juplo/kafka/EndlessConsumer.java
+++ b/src/main/java/de/juplo/kafka/EndlessConsumer.java
@@ -32,11 +32,12 @@ public class EndlessConsumer implements Runnable
   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 final Map<Integer, Map<String, Integer>> seen = new HashMap<>();
+  private final Map<Integer, Map<String, Long>> seen = new HashMap<>();
 
 
   public EndlessConsumer(
@@ -80,7 +81,7 @@ public class EndlessConsumer implements Runnable
           partitions.forEach(tp ->
           {
             log.info("{} - removing partition: {}", id, tp);
-            Map<String, Integer> removed = seen.remove(tp.partition());
+            Map<String, Long> removed = seen.remove(tp.partition());
             for (String key : removed.keySet())
             {
               log.info(
@@ -126,12 +127,12 @@ public class EndlessConsumer implements Runnable
 
           Integer partition = record.partition();
           String key = record.key() == null ? "NULL" : record.key();
-          Map<String, Integer> byKey = seen.get(partition);
+          Map<String, Long> byKey = seen.get(partition);
 
           if (!byKey.containsKey(key))
-            byKey.put(key, 0);
+            byKey.put(key, 0l);
 
-          int seenByKey = byKey.get(key);
+          long seenByKey = byKey.get(key);
           seenByKey++;
           byKey.put(key, seenByKey);
         }
@@ -145,7 +146,7 @@ public class EndlessConsumer implements Runnable
     catch(Exception e)
     {
       log.error("{} - Unexpected error: {}", id, e.toString(), e);
-      shutdown();
+      shutdown(e);
     }
     finally
     {
@@ -156,11 +157,17 @@ public class EndlessConsumer implements Runnable
   }
 
   private void shutdown()
+  {
+    shutdown(null);
+  }
+
+  private void shutdown(Exception e)
   {
     lock.lock();
     try
     {
       running = false;
+      exception = e;
       condition.signal();
     }
     finally
@@ -169,7 +176,7 @@ public class EndlessConsumer implements Runnable
     }
   }
 
-  public Map<Integer, Map<String, Integer>> getSeen()
+  public Map<Integer, Map<String, Long>> getSeen()
   {
     return seen;
   }
@@ -184,6 +191,7 @@ public class EndlessConsumer implements Runnable
 
       log.info("{} - Starting - consumed {} messages before", id, consumed);
       running = true;
+      exception = null;
       executor.submit(this);
     }
     finally
@@ -232,4 +240,33 @@ public class EndlessConsumer implements Runnable
       log.info("{}: Consumed {} messages in total, exiting!", id, consumed);
     }
   }
+
+  public boolean running()
+  {
+    lock.lock();
+    try
+    {
+      return running;
+    }
+    finally
+    {
+      lock.unlock();
+    }
+  }
+
+  public Optional<Exception> exitStatus()
+  {
+    lock.lock();
+    try
+    {
+      if (running)
+        throw new IllegalStateException("No exit-status available: Consumer instance " + id + " is running!");
+
+      return Optional.ofNullable(exception);
+    }
+    finally
+    {
+      lock.unlock();
+    }
+  }
 }