X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationRecordHandler.java;h=207578193005d77640d78b9b30ea08f25153d5fc;hb=refs%2Fheads%2Fsumup-adder--springified;hp=28291579fd85c7efeb885344bce3e9c76fc13db1;hpb=caed9441a9303af071a572405ae4a665d60faae7;p=demos%2Fkafka%2Ftraining

diff --git a/src/main/java/de/juplo/kafka/ApplicationRecordHandler.java b/src/main/java/de/juplo/kafka/ApplicationRecordHandler.java
index 2829157..2075781 100644
--- a/src/main/java/de/juplo/kafka/ApplicationRecordHandler.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRecordHandler.java
@@ -2,7 +2,11 @@ package de.juplo.kafka;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.springframework.kafka.annotation.KafkaHandler;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.kafka.support.KafkaHeaders;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.messaging.handler.annotation.Payload;
 
 import java.time.Duration;
 import java.util.HashMap;
@@ -12,7 +16,10 @@ import java.util.Optional;
 
 @RequiredArgsConstructor
 @Slf4j
-public class ApplicationRecordHandler implements RecordHandler<String, Message>
+@KafkaListener(
+    id = "${spring.kafka.consumer.group-id}",
+    topics = "${sumup.adder.topic}")
+public class ApplicationRecordHandler
 {
   private final AdderResults results;
   private final Optional<Duration> throttle;
@@ -21,42 +28,37 @@ public class ApplicationRecordHandler implements RecordHandler<String, Message>
   private final Map<Integer, AdderBusinessLogic> state = new HashMap<>();
 
 
+  @KafkaHandler
   public void addNumber(
+      @Header(KafkaHeaders.RECEIVED_PARTITION_ID)
       Integer partition,
+      @Header(KafkaHeaders.RECEIVED_MESSAGE_KEY)
       String user,
+      @Payload
       MessageAddNumber message)
   {
+    log.debug("{} - Received {} for {} on {}", id, message, user, partition);
     state.get(partition).addToSum(user, message.getNext());
+    throttle();
   }
 
+  @KafkaHandler
   public void calculateSum(
+      @Header(KafkaHeaders.RECEIVED_PARTITION_ID)
       Integer partition,
+      @Header(KafkaHeaders.RECEIVED_MESSAGE_KEY)
       String user,
+      @Payload
       MessageCalculateSum message)
   {
     AdderResult result = state.get(partition).calculate(user);
     log.info("{} - New result for {}: {}", id, user, result);
     results.addResults(partition, user, result);
+    throttle();
   }
 
-  @Override
-  public void accept(ConsumerRecord<String, Message> record)
+  private void throttle()
   {
-    Integer partition = record.partition();
-    String user = record.key();
-    Message message = record.value();
-
-    switch(message.getType())
-    {
-      case ADD:
-        addNumber(partition, user, (MessageAddNumber) message);
-        break;
-
-      case CALC:
-        calculateSum(partition, user, (MessageCalculateSum) message);
-        break;
-    }
-
     if (throttle.isPresent())
     {
       try
@@ -79,15 +81,4 @@ public class ApplicationRecordHandler implements RecordHandler<String, Message>
   {
     return this.state.remove(partition).getState();
   }
-
-
-  public Map<Integer, AdderBusinessLogic> getState()
-  {
-    return state;
-  }
-
-  public AdderBusinessLogic getState(Integer partition)
-  {
-    return state.get(partition);
-  }
 }