Merge branch 'stored-state' into stored-offsets

[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 7cb77aa..2563204 100644 (file)
--- a/src/main/java/de/juplo/kafka/EndlessConsumer.java
+++ b/src/main/java/de/juplo/kafka/EndlessConsumer.java
@@ -64,6 +64,7 @@ public class EndlessConsumer implements Runnable
       props.put("bootstrap.servers", bootstrapServer);
       props.put("group.id", groupId);
       props.put("client.id", id);
+      props.put("enable.auto.commit", false);
       props.put("auto.offset.reset", autoOffsetReset);
       props.put("metadata.max.age.ms", "1000");
       props.put("key.deserializer", StringDeserializer.class.getName());
@@ -90,7 +91,7 @@ public class EndlessConsumer implements Runnable
                   tp.partition(),
                   key);
             }
-            repository.save(new StatisticsDocument(tp.partition(), removed));
+            repository.save(new StatisticsDocument(tp.partition(), removed, consumer.position(tp)));
           });
         }
 
@@ -100,12 +101,12 @@ public class EndlessConsumer implements Runnable
           partitions.forEach(tp ->
           {
             log.info("{} - adding partition: {}", id, tp);
-            seen.put(
-                tp.partition(),
+            StatisticsDocument document =
                 repository
                     .findById(Integer.toString(tp.partition()))
-                    .map(document -> document.statistics)
-                    .orElse(new HashMap<>()));
+                    .orElse(new StatisticsDocument(tp.partition()));
+            consumer.seek(tp, document.offset);
+            seen.put(tp.partition(), document.statistics);
           });
         }
       });
@@ -141,6 +142,12 @@ public class EndlessConsumer implements Runnable
           seenByKey++;
           byKey.put(key, seenByKey);
         }
+
+        seen.forEach((partiton, statistics) -> repository.save(
+            new StatisticsDocument(
+                partiton,
+                statistics,
+                consumer.position(new TopicPartition(topic, partiton)))));
       }
     }
     catch(WakeupException e)