Skip to content

Commit 7f53aef

Browse files
committed
Upgrade to Kafka 2.6.0
Closes gh-22731
1 parent a8130da commit 7f53aef

File tree

3 files changed

+25
-1
lines changed

3 files changed

+25
-1
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,19 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

19+
import java.util.regex.Pattern;
20+
21+
import org.apache.kafka.streams.StreamsBuilder;
22+
import org.apache.kafka.streams.kstream.KStream;
23+
import org.apache.kafka.streams.kstream.KTable;
24+
import org.apache.kafka.streams.kstream.Materialized;
1925
import org.junit.jupiter.api.Test;
2026

2127
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
2228
import org.springframework.boot.autoconfigure.AutoConfigurations;
2329
import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration;
2430
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
31+
import org.springframework.context.annotation.Bean;
2532
import org.springframework.context.annotation.Configuration;
2633
import org.springframework.kafka.annotation.EnableKafkaStreams;
2734
import org.springframework.kafka.config.StreamsBuilderFactoryBean;
@@ -93,6 +100,12 @@ void whenKafkaStreamsIsEnabledAndThereIsNoMeterRegistryThenListenerCustomization
93100
@EnableKafkaStreams
94101
static class EnableKafkaStreamsConfiguration {
95102

103+
@Bean
104+
public KTable<?, ?> table(StreamsBuilder builder) {
105+
KStream<Object, Object> stream = builder.stream(Pattern.compile("test"));
106+
return stream.groupByKey().count(Materialized.as("store"));
107+
}
108+
96109
}
97110

98111
}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,14 @@
1818

1919
import java.util.concurrent.CountDownLatch;
2020
import java.util.concurrent.TimeUnit;
21+
import java.util.regex.Pattern;
2122

2223
import org.apache.kafka.clients.admin.NewTopic;
2324
import org.apache.kafka.clients.producer.Producer;
25+
import org.apache.kafka.streams.StreamsBuilder;
26+
import org.apache.kafka.streams.kstream.KStream;
27+
import org.apache.kafka.streams.kstream.KTable;
28+
import org.apache.kafka.streams.kstream.Materialized;
2429
import org.junit.jupiter.api.AfterEach;
2530
import org.junit.jupiter.api.Test;
2631

@@ -124,6 +129,12 @@ NewTopic adminCreated() {
124129
@EnableKafkaStreams
125130
static class KafkaStreamsConfig {
126131

132+
@Bean
133+
public KTable<?, ?> table(StreamsBuilder builder) {
134+
KStream<Object, Object> stream = builder.stream(Pattern.compile("test"));
135+
return stream.groupByKey().count(Materialized.as("store"));
136+
}
137+
127138
}
128139

129140
static class Listener {

spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ bom {
892892
]
893893
}
894894
}
895-
library("Kafka", "2.5.0") {
895+
library("Kafka", "2.6.0") {
896896
group("org.apache.kafka") {
897897
modules = [
898898
"connect-api",

0 commit comments

Comments
 (0)