X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplication.java;h=376c4d3e7376a1ca28051e64df04391fd7811da1;hb=b1b6f4890362d5e36f9e5478b69207415ad4b18c;hp=76c2520b393611d4166a3d96f762872f67da39d2;hpb=ce840f48340d55613291fca468bf10b834c473db;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..376c4d3 100644
--- a/src/main/java/de/juplo/kafka/Application.java
+++ b/src/main/java/de/juplo/kafka/Application.java
@@ -1,6 +1,7 @@
 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;
@@ -8,8 +9,9 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 import javax.annotation.PreDestroy;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.Future;
 
 
 @SpringBootApplication
@@ -17,57 +19,29 @@ import java.util.concurrent.TimeUnit;
 public class Application implements ApplicationRunner
 {
   @Autowired
-  EndlessConsumer endlessConsumer;
+  ExecutorService executorService;
   @Autowired
-  ExecutorService executor;
+  Consumer<?, ?> consumer;
+  @Autowired
+  SimpleConsumer simpleConsumer;
 
+  Future<?> consumerJob;
 
   @Override
   public void run(ApplicationArguments args) throws Exception
   {
-    log.info("Starting EndlessConsumer");
-    endlessConsumer.start();
+    log.info("Starting SimpleConsumer");
+    consumerJob = executorService.submit(simpleConsumer);
   }
 
   @PreDestroy
-  public void shutdown()
+  public void shutdown() 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);
-    }
-
-    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
-    {
-      if (!executor.isTerminated())
-      {
-        log.warn("Forcing shutdown of ExecutorService!");
-        executor
-            .shutdownNow()
-            .forEach(runnable -> log.warn("Unprocessed task: {}", runnable.getClass().getSimpleName()));
-      }
-      log.info("Shutdow of ExecutorService finished");
-    }
+    log.info("Signaling SimpleConsumer to quit its work");
+    consumer.wakeup();
+    log.info("Waiting for SimpleConsumer to finish its work");
+    consumerJob.get();
+    log.info("SimpleConsumer finished its work");
   }