X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplication.java;h=718676b95e10c3590aeb7f185e0ee30da7bbcf21;hb=1e858c1835d47259583cf3cce18921c550682e2b;hp=76c2520b393611d4166a3d96f762872f67da39d2;hpb=e11c6152c721440d4a599a6f5fe0fe46f2283f31;p=demos%2Fkafka%2Ftraining

diff --git a/src/main/java/de/juplo/kafka/Application.java b/src/main/java/de/juplo/kafka/Application.java
index 76c2520..718676b 100644
--- a/src/main/java/de/juplo/kafka/Application.java
+++ b/src/main/java/de/juplo/kafka/Application.java
@@ -1,73 +1,51 @@
 package de.juplo.kafka;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.Consumer;
 import org.springframework.beans.factory.annotation.Autowired;
 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.ExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.ExecutionException;
 
 
 @SpringBootApplication
+@EnableAsync
 @Slf4j
 public class Application implements ApplicationRunner
 {
   @Autowired
-  EndlessConsumer endlessConsumer;
+  Consumer<?, ?> kafkaConsumer;
   @Autowired
-  ExecutorService executor;
-
+  SimpleConsumer simpleConsumer;
 
   @Override
   public void run(ApplicationArguments args) throws Exception
   {
-    log.info("Starting EndlessConsumer");
-    endlessConsumer.start();
+    log.info("Starting SimpleConsumer");
+    simpleConsumer.run();
   }
 
   @PreDestroy
-  public void shutdown()
+  public void stop() throws ExecutionException, InterruptedException
   {
-    try
-    {
-      log.info("Stopping EndlessConsumer");
-      endlessConsumer.stop();
-    }
-    catch (IllegalStateException e)
-    {
-      log.info("Was already stopped: {}", e.toString());
-    }
-    catch (Exception e)
-    {
-      log.error("Unexpected exception while stopping EndlessConsumer: {}", e);
-    }
+    log.info("Signaling SimpleConsumer to quit its work");
+    kafkaConsumer.wakeup();
 
-    try
-    {
-      log.info("Shutting down the ExecutorService.");
-      executor.shutdown();
-      log.info("Waiting 5 seconds for the ExecutorService to terminate...");
-      executor.awaitTermination(5, TimeUnit.SECONDS);
-    }
-    catch (InterruptedException e)
-    {
-      log.error("Exception while waiting for the termination of the ExecutorService: {}", e);
-    }
-    finally
+    while (simpleConsumer.isRunning())
     {
-      if (!executor.isTerminated())
+      log.info("Waiting for SimpleConsumer to finish its work");
+      try
       {
-        log.warn("Forcing shutdown of ExecutorService!");
-        executor
-            .shutdownNow()
-            .forEach(runnable -> log.warn("Unprocessed task: {}", runnable.getClass().getSimpleName()));
+        Thread.sleep(1000);
       }
-      log.info("Shutdow of ExecutorService finished");
+      catch (InterruptedException e) {}
     }
+    log.info("SimpleConsumer finished its work");
   }