Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
7f53aef5
Commit
7f53aef5
authored
Aug 04, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to Kafka 2.6.0
Closes gh-22731
parent
a8130da3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
1 deletion
+25
-1
KafkaMetricsAutoConfigurationTests.java
...configure/metrics/KafkaMetricsAutoConfigurationTests.java
+13
-0
KafkaAutoConfigurationIntegrationTests.java
...nfigure/kafka/KafkaAutoConfigurationIntegrationTests.java
+11
-0
build.gradle
spring-boot-project/spring-boot-dependencies/build.gradle
+1
-1
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java
View file @
7f53aef5
...
@@ -16,12 +16,19 @@
...
@@ -16,12 +16,19 @@
package
org
.
springframework
.
boot
.
actuate
.
autoconfigure
.
metrics
;
package
org
.
springframework
.
boot
.
actuate
.
autoconfigure
.
metrics
;
import
java.util.regex.Pattern
;
import
org.apache.kafka.streams.StreamsBuilder
;
import
org.apache.kafka.streams.kstream.KStream
;
import
org.apache.kafka.streams.kstream.KTable
;
import
org.apache.kafka.streams.kstream.Materialized
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun
;
import
org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration
;
import
org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.kafka.annotation.EnableKafkaStreams
;
import
org.springframework.kafka.annotation.EnableKafkaStreams
;
import
org.springframework.kafka.config.StreamsBuilderFactoryBean
;
import
org.springframework.kafka.config.StreamsBuilderFactoryBean
;
...
@@ -93,6 +100,12 @@ class KafkaMetricsAutoConfigurationTests {
...
@@ -93,6 +100,12 @@ class KafkaMetricsAutoConfigurationTests {
@EnableKafkaStreams
@EnableKafkaStreams
static
class
EnableKafkaStreamsConfiguration
{
static
class
EnableKafkaStreamsConfiguration
{
@Bean
public
KTable
<?,
?>
table
(
StreamsBuilder
builder
)
{
KStream
<
Object
,
Object
>
stream
=
builder
.
stream
(
Pattern
.
compile
(
"test"
));
return
stream
.
groupByKey
().
count
(
Materialized
.
as
(
"store"
));
}
}
}
}
}
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java
View file @
7f53aef5
...
@@ -18,9 +18,14 @@ package org.springframework.boot.autoconfigure.kafka;
...
@@ -18,9 +18,14 @@ package org.springframework.boot.autoconfigure.kafka;
import
java.util.concurrent.CountDownLatch
;
import
java.util.concurrent.CountDownLatch
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.TimeUnit
;
import
java.util.regex.Pattern
;
import
org.apache.kafka.clients.admin.NewTopic
;
import
org.apache.kafka.clients.admin.NewTopic
;
import
org.apache.kafka.clients.producer.Producer
;
import
org.apache.kafka.clients.producer.Producer
;
import
org.apache.kafka.streams.StreamsBuilder
;
import
org.apache.kafka.streams.kstream.KStream
;
import
org.apache.kafka.streams.kstream.KTable
;
import
org.apache.kafka.streams.kstream.Materialized
;
import
org.junit.jupiter.api.AfterEach
;
import
org.junit.jupiter.api.AfterEach
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
...
@@ -124,6 +129,12 @@ class KafkaAutoConfigurationIntegrationTests {
...
@@ -124,6 +129,12 @@ class KafkaAutoConfigurationIntegrationTests {
@EnableKafkaStreams
@EnableKafkaStreams
static
class
KafkaStreamsConfig
{
static
class
KafkaStreamsConfig
{
@Bean
public
KTable
<?,
?>
table
(
StreamsBuilder
builder
)
{
KStream
<
Object
,
Object
>
stream
=
builder
.
stream
(
Pattern
.
compile
(
"test"
));
return
stream
.
groupByKey
().
count
(
Materialized
.
as
(
"store"
));
}
}
}
static
class
Listener
{
static
class
Listener
{
...
...
spring-boot-project/spring-boot-dependencies/build.gradle
View file @
7f53aef5
...
@@ -892,7 +892,7 @@ bom {
...
@@ -892,7 +892,7 @@ bom {
]
]
}
}
}
}
library
(
"Kafka"
,
"2.
5
.0"
)
{
library
(
"Kafka"
,
"2.
6
.0"
)
{
group
(
"org.apache.kafka"
)
{
group
(
"org.apache.kafka"
)
{
modules
=
[
modules
=
[
"connect-api"
,
"connect-api"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment