X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fwordcount%2Fquery%2FQueryApplicationIT.java;h=d800fbd4fc7739721505cf9860b89847ba0e31c2;hb=fc5d6c6ee08a4b2e29a045bf4071dd0a4d86bc0d;hp=e38871ff4488bdc69e351af093aabeb86237e0da;hpb=dcb383aef4f4f454e3a1aed9cf1f2a599c7b1bb9;p=demos%2Fkafka%2Fwordcount

diff --git a/src/test/java/de/juplo/kafka/wordcount/query/QueryApplicationIT.java b/src/test/java/de/juplo/kafka/wordcount/query/QueryApplicationIT.java
index e38871f..d800fbd 100644
--- a/src/test/java/de/juplo/kafka/wordcount/query/QueryApplicationIT.java
+++ b/src/test/java/de/juplo/kafka/wordcount/query/QueryApplicationIT.java
@@ -1,5 +1,6 @@
 package de.juplo.kafka.wordcount.query;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.streams.state.KeyValueBytesStoreSupplier;
 import org.apache.kafka.streams.state.Stores;
@@ -11,7 +12,6 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
 import org.springframework.http.MediaType;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.support.SendResult;
@@ -23,16 +23,18 @@ import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 
-import static de.juplo.kafka.wordcount.query.QueryStreamProcessor.STORE_NAME;
+import static de.juplo.kafka.wordcount.query.QueryStreamProcessor.RANKING_STORE_NAME;
+import static de.juplo.kafka.wordcount.query.QueryStreamProcessor.USER_STORE_NAME;
 import static org.awaitility.Awaitility.await;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 
 @SpringBootTest(
 		properties = {
+				"spring.main.allow-bean-definition-overriding=true",
 				"spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer",
 				"spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer",
-				"spring.kafka.producer.properties.spring.json.add.type.headers=false",
+				"spring.kafka.producer.properties.spring.json.type.mapping=userdata:de.juplo.kafka.wordcount.users.TestUserData,ranking:de.juplo.kafka.wordcount.top10.TestRanking",
 				"logging.level.root=WARN",
 				"logging.level.de.juplo=DEBUG",
 				"logging.level.org.apache.kafka.clients=INFO",
@@ -52,6 +54,8 @@ public class QueryApplicationIT
 	@Autowired
 	MockMvc mockMvc;
 	@Autowired
+	ObjectMapper objectMapper;
+	@Autowired
 	QueryStreamProcessor streamProcessor;
 
 
@@ -103,17 +107,19 @@ public class QueryApplicationIT
 				.untilAsserted(() -> TestData.assertExpectedState(user -> requestUserRankingFor(user)));
 	}
 
-	private String requestUserRankingFor(String user)
+	private UserRanking requestUserRankingFor(String user)
 	{
 		try
 		{
-			return mockMvc
-					.perform(MockMvcRequestBuilders.get("/{user}", user)
-							.contentType(MediaType.APPLICATION_JSON))
-					.andExpect(status().isOk())
-					.andReturn()
-					.getResponse()
-					.getContentAsString(StandardCharsets.UTF_8);
+			return objectMapper.readValue(
+					mockMvc
+							.perform(MockMvcRequestBuilders.get("/{user}", user)
+									.contentType(MediaType.APPLICATION_JSON))
+							.andExpect(status().isOk())
+							.andReturn()
+							.getResponse()
+							.getContentAsString(StandardCharsets.UTF_8),
+					UserRanking.class);
 		}
 		catch (Exception e)
 		{
@@ -124,11 +130,16 @@ public class QueryApplicationIT
 	@TestConfiguration
 	static class Configuration
 	{
-		@Primary
 		@Bean
-		KeyValueBytesStoreSupplier inMemoryStoreSupplier()
+		KeyValueBytesStoreSupplier userStoreSupplier()
+		{
+			return Stores.inMemoryKeyValueStore(USER_STORE_NAME);
+		}
+
+		@Bean
+		KeyValueBytesStoreSupplier rankingStoreSupplier()
 		{
-			return Stores.inMemoryKeyValueStore(STORE_NAME);
+			return Stores.inMemoryKeyValueStore(RANKING_STORE_NAME);
 		}
 	}
 }