Merge branch 'rest-producer' into rest-producer-vorlage

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

diff --git a/src/main/java/de/juplo/kafka/RestProducer.java b/src/main/java/de/juplo/kafka/RestProducer.java
index de08ce2..009a1f2 100644 (file)
--- a/src/main/java/de/juplo/kafka/RestProducer.java
+++ b/src/main/java/de/juplo/kafka/RestProducer.java
@@ -1,20 +1,21 @@
 package de.juplo.kafka;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.common.serialization.StringSerializer;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
 
 import javax.annotation.PreDestroy;
-import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 
 
 @Slf4j
-@RestController
+@RequestMapping
+@ResponseBody
+@RequiredArgsConstructor
 public class RestProducer
 {
   private final String id;
@@ -24,27 +25,6 @@ public class RestProducer
 
   private long produced = 0;
 
-  public RestProducer(ApplicationProperties properties)
-  {
-    this.id = properties.getClientId();
-    this.topic = properties.getTopic();
-    this.partition = properties.getPartition();
-
-    Properties props = new Properties();
-    props.put("bootstrap.servers", properties.getBootstrapServer());
-    props.put("client.id", properties.getClientId());
-    props.put("acks", properties.getAcks());
-    props.put("batch.size", properties.getBatchSize());
-    props.put("delivery.timeout.ms", 20000); // 20 Sekunden
-    props.put("request.timeout.ms",  10000); // 10 Sekunden
-    props.put("linger.ms", properties.getLingerMs());
-    props.put("compression.type", properties.getCompressionType());
-    props.put("key.serializer", StringSerializer.class.getName());
-    props.put("value.serializer", StringSerializer.class.getName());
-
-    this.producer = new KafkaProducer<>(props);
-  }
-
   @PostMapping(path = "{key}")
   public DeferredResult<ProduceResult> send(
       @PathVariable String key,
@@ -75,13 +55,4 @@ public class RestProducer
   {
     return new ErrorResponse(e.getMessage(), HttpStatus.BAD_REQUEST.value());
   }
-
-  @PreDestroy
-  public void destroy() throws ExecutionException, InterruptedException
-  {
-    log.info("{} - Destroy!", id);
-    log.info("{} - Closing the KafkaProducer", id);
-    producer.close();
-    log.info("{}: Produced {} messages in total, exiting!", id, produced);
-  }
 }