WIP:sleep

[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 f37f3d7..718676b 100644 (file)
--- a/src/main/java/de/juplo/kafka/Application.java
+++ b/src/main/java/de/juplo/kafka/Application.java
@@ -7,21 +7,19 @@ import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 import javax.annotation.PreDestroy;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Future;
 
 
 @SpringBootApplication
+@EnableAsync
 @Slf4j
 public class Application implements ApplicationRunner
 {
   @Autowired
-  Executor executor;
-  @Autowired
-  Consumer<?, ?> consumer;
+  Consumer<?, ?> kafkaConsumer;
   @Autowired
   SimpleConsumer simpleConsumer;
 
@@ -29,14 +27,25 @@ public class Application implements ApplicationRunner
   public void run(ApplicationArguments args) throws Exception
   {
     log.info("Starting SimpleConsumer");
-    executor.execute(simpleConsumer);
+    simpleConsumer.run();
   }
 
   @PreDestroy
-  public void shutdown() throws ExecutionException, InterruptedException
+  public void stop() throws ExecutionException, InterruptedException
   {
     log.info("Signaling SimpleConsumer to quit its work");
-    consumer.wakeup();
+    kafkaConsumer.wakeup();
+
+    while (simpleConsumer.isRunning())
+    {
+      log.info("Waiting for SimpleConsumer to finish its work");
+      try
+      {
+        Thread.sleep(1000);
+      }
+      catch (InterruptedException e) {}
+    }
+    log.info("SimpleConsumer finished its work");
   }