X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fquery%2FQueryStreamProcessor.java;h=e075eb756b2febf506543f4752585fce75c42770;hb=b52ff02b6952dfc708c7c7d94205b5b24afd68f9;hp=ff7c1501c0a7cae4e2373d729bf240f18677ff47;hpb=57f47fca712981116b726e437f589ac727c5d0a7;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 ff7c150..e075eb7 100644
--- a/src/main/java/de/juplo/kafka/wordcount/query/QueryStreamProcessor.java
+++ b/src/main/java/de/juplo/kafka/wordcount/query/QueryStreamProcessor.java
@@ -1,19 +1,16 @@
 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.common.serialization.Serdes;
 import org.apache.kafka.streams.*;
-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.kstream.*;
 import org.apache.kafka.streams.state.HostInfo;
 import org.apache.kafka.streams.state.KeyValueBytesStoreSupplier;
 import org.apache.kafka.streams.state.QueryableStoreTypes;
 import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
+import org.springframework.kafka.support.serializer.JsonSerde;
 
 import java.net.URI;
 import java.util.Optional;
@@ -23,12 +20,12 @@ import java.util.Properties;
 @Slf4j
 public class QueryStreamProcessor
 {
-	public static final String STORE_NAME = "rankings-by-username";
+	public static final String USER_STORE_NAME = "users";
+	public static final String RANKING_STORE_NAME = "rankings";
 
 	public final KafkaStreams streams;
 	public final HostInfo hostInfo;
-	public final StoreQueryParameters<ReadOnlyKeyValueStore<String, String>> storeParameters;
-	public final ObjectMapper mapper;
+	public final StoreQueryParameters<ReadOnlyKeyValueStore<String, UserRanking>> storeParameters;
 
 
 	public QueryStreamProcessor(
@@ -36,51 +33,51 @@ public class QueryStreamProcessor
 			HostInfo applicationServer,
 			String usersInputTopic,
 			String rankingInputTopic,
-			KeyValueBytesStoreSupplier storeSupplier,
-			ObjectMapper mapper)
+			KeyValueBytesStoreSupplier userStoreSupplier,
+			KeyValueBytesStoreSupplier rankingStoreSupplier)
 	{
 		Topology topology = buildTopology(
 				usersInputTopic,
 				rankingInputTopic,
-				storeSupplier,
-				mapper);
+				userStoreSupplier,
+				rankingStoreSupplier);
 		streams = new KafkaStreams(topology, props);
 		hostInfo = applicationServer;
-		storeParameters = StoreQueryParameters.fromNameAndType(STORE_NAME, QueryableStoreTypes.keyValueStore());;
-		this.mapper = mapper;
+		storeParameters = StoreQueryParameters.fromNameAndType(RANKING_STORE_NAME, QueryableStoreTypes.keyValueStore());;
 	}
 
 	static Topology buildTopology(
 			String usersInputTopic,
 			String rankingInputTopic,
-			KeyValueBytesStoreSupplier storeSupplier,
-			ObjectMapper mapper)
+			KeyValueBytesStoreSupplier userStoreSupplier,
+			KeyValueBytesStoreSupplier rankingStoreSupplier)
 	{
 		StreamsBuilder builder = new StreamsBuilder();
 
-		KTable<String, String> users = builder.table(usersInputTopic);
-		KStream<String, String> rankings = builder.stream(rankingInputTopic);
+		KTable<String, User> users = builder
+				.stream(
+						usersInputTopic,
+						Consumed.with(Serdes.String(), new JsonSerde().copyWithType(User.class)))
+				.toTable(
+						Materialized
+								.<String, User>as(userStoreSupplier)
+								.withKeySerde(Serdes.String())
+								.withValueSerde(new JsonSerde().copyWithType(User.class)));
+		KStream<String, Ranking> rankings = builder
+				.<Key, Ranking>stream(rankingInputTopic)
+				.map((key, value) -> new KeyValue<>(key.getUser(), value));
 
 		rankings
-				.join(users, (rankingJson, userJson) ->
-				{
-					try
-					{
-						Ranking ranking = mapper.readValue(rankingJson, Ranking.class);
-						User user = mapper.readValue(userJson, User.class);
-
-						return mapper.writeValueAsString(
-								UserRanking.of(
-										user.getFirstName(),
-										user.getLastName(),
-										ranking.getEntries()));
-					}
-					catch (JsonProcessingException e)
-					{
-						throw new RuntimeException(e);
-					}
-				})
-				.toTable(Materialized.as(storeSupplier));
+				.join(users, (ranking, user) -> UserRanking.of(
+						user.getFirstName(),
+						user.getLastName(),
+						ranking.getEntries()),
+						Joined.keySerde(Serdes.String()))
+				.toTable(
+						Materialized
+								.<String, UserRanking>as(rankingStoreSupplier)
+								.withKeySerde(Serdes.String())
+								.withValueSerde(new JsonSerde().copyWithType(UserRanking.class)));
 
 		Topology topology = builder.build();
 		log.info("\n\n{}", topology.describe());
@@ -95,7 +92,7 @@ public class QueryStreamProcessor
 
 	public Optional<URI> getRedirect(String username)
 	{
-		KeyQueryMetadata metadata = streams.queryMetadataForKey(STORE_NAME, username, Serdes.String().serializer());
+		KeyQueryMetadata metadata = streams.queryMetadataForKey(RANKING_STORE_NAME, username, Serdes.String().serializer());
 		HostInfo activeHost = metadata.activeHost();
 		log.debug("Local store for {}: {}, {}:{}", username, metadata.partition(), activeHost.host(), activeHost.port());
 
@@ -111,20 +108,7 @@ public class QueryStreamProcessor
 
 	public Optional<UserRanking> getUserRanking(String username)
 	{
-		return
-				Optional
-						.ofNullable(getStore().get(username))
-						.map(json ->
-						{
-							try
-							{
-								return mapper.readValue(json, UserRanking.class);
-							}
-							catch (JsonProcessingException e)
-							{
-								throw new RuntimeException(e);
-							}
-						});
+		return Optional.ofNullable(getStore().get(username));
 	}
 
 	@PostConstruct