query: 2.0.0 - Configured caching & commit-interval in integration-test

[demos/kafka/wordcount] / src / test / java / de / juplo / kafka / wordcount / query / QueryApplicationIT.java

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..58a1206 100644 (file)
--- 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,21 +23,25 @@ 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",
                                "logging.level.org.apache.kafka.streams=INFO",
                                "juplo.wordcount.query.bootstrap-server=${spring.embedded.kafka.brokers}",
+                               "juplo.wordcount.query.commit-interval=100",
+                               "juplo.wordcount.query.cache-max-bytes=0",
                                "juplo.wordcount.query.users-input-topic=" + QueryApplicationIT.TOPIC_USERS,
                                "juplo.wordcount.query.ranking-input-topic=" + QueryApplicationIT.TOPIC_TOP10 })
 @AutoConfigureMockMvc
@@ -52,6 +56,8 @@ public class QueryApplicationIT
        @Autowired
        MockMvc mockMvc;
        @Autowired
+       ObjectMapper objectMapper;
+       @Autowired
        QueryStreamProcessor streamProcessor;
 
 
@@ -103,17 +109,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 +132,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);
                }
        }
 }