X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fquery%2FQueryStreamProcessor.java;h=15b28dbdc5246fea5e149957b5ad3a927df8abf2;hb=5c3e257b49dbcabc0fadc7fd335dcfc4ba57c6ef;hp=7e7af211239e7f26bc14d310096e1df4f6c7ac4d;hpb=8b1fd41f91be906ac0c691b4df7c528cad9ff583;p=demos%2Fkafka%2Fwordcount

diff --git a/src/main/java/de/juplo/kafka/wordcount/query/QueryStreamProcessor.java b/src/main/java/de/juplo/kafka/wordcount/query/QueryStreamProcessor.java
index 7e7af21..15b28db 100644
--- a/src/main/java/de/juplo/kafka/wordcount/query/QueryStreamProcessor.java
+++ b/src/main/java/de/juplo/kafka/wordcount/query/QueryStreamProcessor.java
@@ -2,47 +2,43 @@ package de.juplo.kafka.wordcount.query;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.common.serialization.Serdes;
-import org.apache.kafka.streams.*;
+import org.apache.kafka.streams.KafkaStreams;
+import org.apache.kafka.streams.KeyQueryMetadata;
+import org.apache.kafka.streams.StoreQueryParameters;
+import org.apache.kafka.streams.StreamsBuilder;
 import org.apache.kafka.streams.kstream.KStream;
 import org.apache.kafka.streams.kstream.KTable;
 import org.apache.kafka.streams.kstream.Materialized;
 import org.apache.kafka.streams.state.HostInfo;
 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 javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.net.URI;
 import java.util.Optional;
 import java.util.Properties;
-import java.util.concurrent.CompletableFuture;
-
-import static org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.StreamThreadExceptionResponse.SHUTDOWN_CLIENT;
 
 
 @Slf4j
 public class QueryStreamProcessor
 {
+	public static final String STORE_NAME = "rankings-by-username";
+
 	public final KafkaStreams streams;
 	public final HostInfo hostInfo;
-	public final String storeName = "rankingsByUsername";
 	public final StoreQueryParameters<ReadOnlyKeyValueStore<String, String>> storeParameters;
 	public final ObjectMapper mapper;
 
 
 	public QueryStreamProcessor(
-			String applicationId,
+			Properties props,
 			HostInfo applicationServer,
-			String bootstrapServer,
 			String usersInputTopic,
 			String rankingInputTopic,
-			ObjectMapper mapper,
-			ConfigurableApplicationContext context)
+			ObjectMapper mapper)
 	{
 		StreamsBuilder builder = new StreamsBuilder();
 
@@ -68,36 +64,17 @@ public class QueryStreamProcessor
 						throw new RuntimeException(e);
 					}
 				})
-				.toTable(Materialized.as(storeName));
-
-		Properties props = new Properties();
-		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");
+				.toTable(Materialized.as(STORE_NAME));
 
 		streams = new KafkaStreams(builder.build(), props);
-		streams.setUncaughtExceptionHandler((Throwable e) ->
-		{
-			log.error("Unexpected error!", e);
-			CompletableFuture.runAsync(() ->
-			{
-				log.info("Stopping application...");
-				SpringApplication.exit(context, () -> 1);
-			});
-			return SHUTDOWN_CLIENT;
-		});
-
 		hostInfo = applicationServer;
-		storeParameters = StoreQueryParameters.fromNameAndType(storeName, QueryableStoreTypes.keyValueStore());;
+		storeParameters = StoreQueryParameters.fromNameAndType(STORE_NAME, QueryableStoreTypes.keyValueStore());;
 		this.mapper = mapper;
 	}
 
 	public Optional<URI> getRedirect(String username)
 	{
-		KeyQueryMetadata metadata = streams.queryMetadataForKey(storeName, username, Serdes.String().serializer());
+		KeyQueryMetadata metadata = streams.queryMetadataForKey(STORE_NAME, username, Serdes.String().serializer());
 		HostInfo activeHost = metadata.activeHost();
 		log.debug("Local store for {}: {}, {}:{}", username, metadata.partition(), activeHost.host(), activeHost.port());