X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplication.java;h=a4d9aeb8ef5580f2c70422101ba93b33dc998289;hb=f095f71a104fcde025a63f87ba75eb5cb3136656;hp=dd4b20a02dd4d8eae5160b49e476817ca80874e7;hpb=ecd5cb8483c199e0d50507a967ddcd31cd8b2aa1;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 dd4b20a..a4d9aeb 100644
--- a/src/main/java/de/juplo/kafka/Application.java
+++ b/src/main/java/de/juplo/kafka/Application.java
@@ -1,45 +1,49 @@
 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;
 
 
 @SpringBootApplication
-@EnableConfigurationProperties(ApplicationProperties.class)
-public class Application
+@Slf4j
+public class Application implements ApplicationRunner
 {
   @Autowired
-  ApplicationProperties properties;
+  EndlessConsumer endlessConsumer;
 
 
-  @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(),
-            properties.getAutoOffsetReset());
-
-    consumer.start();
-
-    return consumer;
+    log.info("Starting EndlessConsumer");
+    endlessConsumer.start();
   }
 
+  @PreDestroy
+  public void shutdown()
+  {
+    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);
+    }
+  }
+
+
   public static void main(String[] args)
   {
     SpringApplication.run(Application.class, args);