X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplication.java;h=b5bd1b9981bee8f1d25eea21a5933d2ab8326b40;hb=d2f482e5eb951e725f4193f97d979330e91c930e;hp=85d0e079e50355e09378bf7b9e47150dca5752bd;hpb=e87f4bb2bc188252955fb4932ddd99161ba621d3;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 85d0e07..b5bd1b9 100644
--- a/src/main/java/de/juplo/kafka/Application.java
+++ b/src/main/java/de/juplo/kafka/Application.java
@@ -1,44 +1,63 @@
 package de.juplo.kafka;
 
+import lombok.extern.slf4j.Slf4j;
 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.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.util.Assert;
 
-import java.util.concurrent.Executors;
+import javax.annotation.PreDestroy;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
 
 
 @SpringBootApplication
-@EnableConfigurationProperties(ApplicationProperties.class)
-public class Application
+@Slf4j
+public class Application implements ApplicationRunner
 {
   @Autowired
-  ApplicationProperties properties;
+  EndlessConsumer endlessConsumer;
+  @Autowired
+  ExecutorService executor;
 
 
-  @Bean
-  public EndlessConsumer consumer()
+  @Override
+  public void run(ApplicationArguments args) throws Exception
   {
-    Assert.hasText(properties.getBootstrapServer(), "consumer.bootstrap-server must be set");
-    Assert.hasText(properties.getGroupId(), "consumer.group-id must be set");
-    Assert.hasText(properties.getClientId(), "consumer.client-id must be set");
-    Assert.hasText(properties.getTopic(), "consumer.topic must be set");
-
-    EndlessConsumer consumer =
-        new EndlessConsumer(
-            Executors.newFixedThreadPool(1),
-            properties.getBootstrapServer(),
-            properties.getGroupId(),
-            properties.getClientId(),
-            properties.getTopic());
-
-    consumer.start();
-
-    return consumer;
+    log.info("Starting EndlessConsumer");
+    endlessConsumer.start();
   }
 
+  @PreDestroy
+  public void stopExecutor()
+  {
+    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.toString());
+    }
+    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");
+    }
+  }
+
+
   public static void main(String[] args)
   {
     SpringApplication.run(Application.class, args);