X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplication.java;h=718676b95e10c3590aeb7f185e0ee30da7bbcf21;hb=1e858c1835d47259583cf3cce18921c550682e2b;hp=bcbf41848038e4754f0bb729a98d9d3b6ff8592e;hpb=620191782035383e0083dc348e4941c9cec0d994;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 bcbf418..718676b 100644
--- a/src/main/java/de/juplo/kafka/Application.java
+++ b/src/main/java/de/juplo/kafka/Application.java
@@ -1,46 +1,54 @@
 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.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.util.Assert;
+import org.springframework.scheduling.annotation.EnableAsync;
 
-import java.util.concurrent.Executors;
+import javax.annotation.PreDestroy;
+import java.util.concurrent.ExecutionException;
 
 
 @SpringBootApplication
-@EnableConfigurationProperties(ApplicationProperties.class)
-public class Application
+@EnableAsync
+@Slf4j
+public class Application implements ApplicationRunner
 {
   @Autowired
-  ApplicationProperties properties;
+  Consumer<?, ?> kafkaConsumer;
+  @Autowired
+  SimpleConsumer simpleConsumer;
 
+  @Override
+  public void run(ApplicationArguments args) throws Exception
+  {
+    log.info("Starting SimpleConsumer");
+    simpleConsumer.run();
+  }
 
-  @Bean
-  public EndlessConsumer consumer(PartitionStatisticsRepository repository)
+  @PreDestroy
+  public void stop() throws ExecutionException, InterruptedException
   {
-    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),
-            repository,
-            properties.getBootstrapServer(),
-            properties.getGroupId(),
-            properties.getClientId(),
-            properties.getTopic(),
-            properties.getAutoOffsetReset());
-
-    consumer.start();
-
-    return consumer;
+    log.info("Signaling SimpleConsumer to quit its work");
+    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");
   }
 
+
   public static void main(String[] args)
   {
     SpringApplication.run(Application.class, args);