Merge branch 'main' into renovate/spring-cloud

rajadilipkolli · Nov 9, 2024 · 76ea112 · 76ea112
2 parents 897c9db + 291cb51
commit 76ea112
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/...-consumer/src/main/java/com/example/analytics/configuration/KafkaTopicsConfiguration.java b/...-consumer/src/main/java/com/example/analytics/configuration/KafkaTopicsConfiguration.java
@@ -1,7 +1,6 @@
 /* Licensed under Apache-2.0 2021-2023 */
 package com.example.analytics.configuration;
 
-import org.apache.kafka.common.config.TopicConfig;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.kafka.config.TopicBuilder;
@@ -16,9 +15,6 @@ NewTopics kafkaTopics(final AnalyticsApplicationProperties analyticsApplicationP
                 // pcsTopic
                 TopicBuilder.name(analyticsApplicationProperties.topicNamePcs()).compact().build(),
                 // pvsTopic
-                TopicBuilder.name(analyticsApplicationProperties.topicNamePvs())
-                        .replicas(analyticsApplicationProperties.replication())
-                        .config(TopicConfig.COMPRESSION_TYPE_CONFIG, "zstd")
-                        .build());
+                TopicBuilder.name(analyticsApplicationProperties.topicNamePvs()).build());
     }
 }
diff --git a/...umer/src/test/java/com/example/analytics/AnalyticsConsumerApplicationIntegrationTest.java b/...umer/src/test/java/com/example/analytics/AnalyticsConsumerApplicationIntegrationTest.java
@@ -25,12 +25,7 @@
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.web.servlet.MockMvc;
 
-@SpringBootTest(
-        properties = {
-            "spring.kafka.consumer.auto.offset.reset=earliest",
-            "spring.kafka.consumer.group.id=pcs"
-        },
-        classes = ContainersConfiguration.class)
+@SpringBootTest(classes = ContainersConfiguration.class)
 @AutoConfigureMockMvc
 class AnalyticsConsumerApplicationIntegrationTest {
 
@@ -61,7 +56,7 @@ void setUpData() throws JsonProcessingException, InterruptedException {
     void verifyProcessing() {
 
         await().pollInterval(Duration.ofSeconds(1))
-                .atMost(60, TimeUnit.SECONDS)
+                .atMost(30, TimeUnit.SECONDS)
                 .untilAsserted(
                         () -> {
                             MockHttpServletResponse response =