query: 1.0.6 - Refined `QueryAppilcationConfiguration`

[demos/kafka/wordcount] / src / main / java / de / juplo / kafka / wordcount / query / QueryApplicationConfiguration.java

diff --git a/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java b/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
index dfc4339..3f866f0 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/wordcount/query/QueryApplicationConfiguration.java
@@ -18,16 +18,14 @@ import java.net.Socket;
 public class QueryApplicationConfiguration
 {
        @Bean
-       public QueryStreamProcessor streamProcessor(
+       public HostInfo applicationServer(
                        ServerProperties serverProperties,
-                       QueryApplicationProperties properties,
-                       ObjectMapper mapper,
-                       ConfigurableApplicationContext context) throws IOException
+                       QueryApplicationProperties applicationProperties) throws IOException
        {
                String host;
                if (serverProperties.getAddress() == null)
                {
-                       HostInfo bootstrapServer = HostInfo.buildFromEndpoint(properties.getBootstrapServer());
+                       HostInfo bootstrapServer = HostInfo.buildFromEndpoint(applicationProperties.getBootstrapServer());
                        Socket socket = new Socket();
                        socket.connect(new InetSocketAddress(bootstrapServer.host(), bootstrapServer.port()));
                        host = socket.getLocalAddress().getHostAddress();
@@ -39,12 +37,22 @@ public class QueryApplicationConfiguration
 
                Integer port = serverProperties.getPort() == null ? 8080 : serverProperties.getPort();
 
+               return new HostInfo(host, port);
+       }
+
+       @Bean
+       public QueryStreamProcessor streamProcessor(
+                       QueryApplicationProperties applicationProperties,
+                       HostInfo applicationServer,
+                       ObjectMapper mapper,
+                       ConfigurableApplicationContext context)
+       {
                return new QueryStreamProcessor(
-                               properties.getApplicationId(),
-                               new HostInfo(host, port),
-                               properties.getBootstrapServer(),
-                               properties.getUsersInputTopic(),
-                               properties.getRankingInputTopic(),
+                               applicationProperties.getApplicationId(),
+                               applicationServer,
+                               applicationProperties.getBootstrapServer(),
+                               applicationProperties.getUsersInputTopic(),
+                               applicationProperties.getRankingInputTopic(),
                                mapper,
                                context);
        }