WIP

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

diff --git a/src/main/java/de/juplo/kafka/Application.java b/src/main/java/de/juplo/kafka/Application.java
index 94224e1..862c5f2 100644 (file)
--- a/src/main/java/de/juplo/kafka/Application.java
+++ b/src/main/java/de/juplo/kafka/Application.java
@@ -11,36 +11,39 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.kafka.core.ConsumerFactory;
 
 import javax.annotation.PreDestroy;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
 
 
 @SpringBootApplication
 @Slf4j
 public class Application implements ApplicationRunner
 {
+  @Autowired
+  ExecutorService executorService;
   @Autowired
   Consumer<String, Message> consumer;
   @Autowired
   SimpleConsumer simpleConsumer;
 
+  Future<?> consumerJob;
 
   @Override
   public void run(ApplicationArguments args) throws Exception
   {
-    log.info("Starting EndlessConsumer");
-    simpleConsumer.start();
+    log.info("Starting SimpleConsumer");
+    consumerJob = executorService.submit(simpleConsumer);
   }
 
   @PreDestroy
-  public void shutdown()
+  public void shutdown() throws ExecutionException, InterruptedException
   {
-    log.info("Signaling the consumer to quit its work");
+    log.info("Signaling SimpleConsumer to quit its work");
     consumer.wakeup();
-  }
-
-  @Bean(destroyMethod = "close")
-  public Consumer<String, Message> kafkaConsumer(ConsumerFactory<String, Message> factory)
-  {
-    return factory.createConsumer();
+    log.info("Waiting for SimpleConsumer to finish its work");
+    consumerJob.get();
+    log.info("SimpleConsumer finished its work");
   }