users:1.0.3 - application.server is derived from the local address

diff --git a/pom.xml b/pom.xml
index e46706ed8f94eb666e0f3b23686fc5cc93f1a23c..c98538aca5d76d0927ff3840f37b7c6161239836 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
        </parent>
        <groupId>de.juplo.kafka.wordcount</groupId>
        <artifactId>users</artifactId>
-       <version>1.0.2</version>
+       <version>1.0.3</version>
        <name>Wordcount-Users</name>
        <description>Users-service of the multi-user wordcount-example</description>
        <properties>

diff --git a/src/main/java/de/juplo/kafka/wordcount/users/UsersApplication.java b/src/main/java/de/juplo/kafka/wordcount/users/UsersApplication.java
index 9ae44e1fdefde706b2bc4d6519af00842174cc69..17cad12e801bde733f68ec6785b030a6babdf607 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/users/UsersApplication.java
+++ b/src/main/java/de/juplo/kafka/wordcount/users/UsersApplication.java
@@ -1,14 +1,21 @@
 package de.juplo.kafka.wordcount.users;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.common.serialization.StringSerializer;
+import org.apache.kafka.streams.state.HostInfo;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.util.Assert;
 
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
 import java.util.Properties;
 
 
@@ -29,6 +36,38 @@ public class UsersApplication
                return new KafkaProducer<>(props);
        }
 
+       @Bean
+       public UsersStreamProcessor usersStreamProcessor(
+                       ServerProperties serverProperties,
+                       UsersApplicationProperties properties,
+                       ObjectMapper mapper,
+                       ConfigurableApplicationContext context) throws IOException
+       {
+               String host;
+               if (serverProperties.getAddress() == null)
+               {
+                       HostInfo bootstrapServer = HostInfo.buildFromEndpoint(properties.getBootstrapServer());
+                       Socket socket = new Socket();
+                       socket.connect(new InetSocketAddress(bootstrapServer.host(), bootstrapServer.port()));
+                       host = socket.getLocalAddress().getHostAddress();
+               }
+               else
+               {
+                       host = serverProperties.getAddress().getHostAddress();
+               }
+
+               Integer port = serverProperties.getPort() == null ? 8080 : serverProperties.getPort();
+
+               return new UsersStreamProcessor(
+                               properties.getApplicationId(),
+                               new HostInfo(host, port),
+                               properties.getBootstrapServer(),
+                               properties.getTopic(),
+                               mapper,
+                               context);
+       }
+
+
        public static void main(String[] args)
        {
                SpringApplication.run(UsersApplication.class, args);

diff --git a/src/main/java/de/juplo/kafka/wordcount/users/UsersApplicationProperties.java b/src/main/java/de/juplo/kafka/wordcount/users/UsersApplicationProperties.java
index 2c50208d9ed47c28c72cf832af4a5df6e2951ed4..cf88a954ff614fcaa93f54342540e096482a77cb 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/users/UsersApplicationProperties.java
+++ b/src/main/java/de/juplo/kafka/wordcount/users/UsersApplicationProperties.java
@@ -16,5 +16,4 @@ public class UsersApplicationProperties
   private String bootstrapServer = "localhost:9092";
   private String applicationId = "users";
   private String topic = "users";
-  private String applicationServer = "localhost:8080";
 }

diff --git a/src/main/java/de/juplo/kafka/wordcount/users/UsersStreamProcessor.java b/src/main/java/de/juplo/kafka/wordcount/users/UsersStreamProcessor.java
index ef39e89076cab6b0ccfaf146c75c1ef56161cd54..1c7572e706709bb8f99df70070a57dccb1c6dada 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/users/UsersStreamProcessor.java
+++ b/src/main/java/de/juplo/kafka/wordcount/users/UsersStreamProcessor.java
@@ -12,7 +12,6 @@ import org.apache.kafka.streams.state.QueryableStoreTypes;
 import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
 import org.springframework.boot.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -25,7 +24,6 @@ import static org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.St
 
 
 @Slf4j
-@Component
 public class UsersStreamProcessor
 {
        public final KafkaStreams streams;
@@ -36,17 +34,20 @@ public class UsersStreamProcessor
 
 
        public UsersStreamProcessor(
-                       UsersApplicationProperties properties,
+                       String applicationId,
+                       HostInfo applicationServer,
+                       String bootstrapServer,
+                       String topic,
                        ObjectMapper mapper,
                        ConfigurableApplicationContext context)
        {
                StreamsBuilder builder = new StreamsBuilder();
-               builder.table(properties.getTopic(), Materialized.as(storeName));
+               builder.table(topic, Materialized.as(storeName));
 
                Properties props = new Properties();
-               props.put(StreamsConfig.APPLICATION_ID_CONFIG, properties.getApplicationId());
-               props.put(StreamsConfig.APPLICATION_SERVER_CONFIG, properties.getApplicationServer());
-               props.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, properties.getBootstrapServer());
+               props.put(StreamsConfig.APPLICATION_ID_CONFIG, applicationId);
+               props.put(StreamsConfig.APPLICATION_SERVER_CONFIG, applicationServer.host() + ":" + applicationServer.port());
+               props.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServer);
                props.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName());
                props.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName());
                props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
@@ -63,7 +64,7 @@ public class UsersStreamProcessor
                        return SHUTDOWN_CLIENT;
                });
 
-               hostInfo = HostInfo.buildFromEndpoint(properties.getApplicationServer());
+               hostInfo = applicationServer;
                storeParameters = StoreQueryParameters.fromNameAndType(storeName, QueryableStoreTypes.keyValueStore());;
                this.mapper = mapper;
        }