Skip to content

Upgrade to Kafka 4.1.0 and update API usage #4072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 5, 2025
Merged

Upgrade to Kafka 4.1.0 and update API usage #4072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ ext {
jaywayJsonPathVersion = '2.9.0'
junit4Version = '4.13.2'
junitJupiterVersion = '5.13.4'
kafkaVersion = '4.0.0'
kafkaVersion = '4.1.0'
kotlinCoroutinesVersion = '1.10.2'
log4jVersion = '2.25.1'
micrometerDocsVersion = '1.0.4'
Expand Down
7 changes: 3 additions & 4 deletions ...-kafka/src/test/java/org/springframework/kafka/core/DefaultShareConsumerFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.apache.kafka.clients.admin.AdminClient;
import org.apache.kafka.clients.admin.AlterConfigOp;
import org.apache.kafka.clients.admin.ConfigEntry;
import org.apache.kafka.clients.consumer.AcknowledgeType;
import org.apache.kafka.clients.consumer.ShareConsumer;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerConfig;
Expand All @@ -56,8 +55,6 @@
@EmbeddedKafka(
topics = {"embedded-share-test", "embedded-share-distribution-test"}, partitions = 1,
brokerProperties = {
"unstable.api.versions.enable=true",
"group.coordinator.rebalance.protocols=classic,share",
"share.coordinator.state.topic.replication.factor=1",
"share.coordinator.state.topic.min.isr=1"
})
Expand Down Expand Up @@ -248,7 +245,9 @@ private static List<String> runSharedConsumerTest(String topic, String groupId,
var records = consumer.poll(Duration.ofMillis(200));
for (var r : records) {
allReceived.add(r.value());
consumer.acknowledge(r, AcknowledgeType.ACCEPT);
// Leverage implicit acknowledgment where records are automatically treated as ACCEPT
// Use commitSync() for explicit commit timing instead of relying on next poll() auto-commit
consumer.commitSync(Duration.ofMillis(10000));
latch.countDown();
}
}
Expand Down
2 changes: 0 additions & 2 deletions .../src/test/java/org/springframework/kafka/listener/ShareKafkaListenerIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@
@DirtiesContext
@EmbeddedKafka(topics = "share-listener-integration-test",
brokerProperties = {
"unstable.api.versions.enable=true",
"group.coordinator.rebalance.protocols=classic,share",
"share.coordinator.state.topic.replication.factor=1",
"share.coordinator.state.topic.min.isr=1"
})
Expand Down
2 changes: 0 additions & 2 deletions ...rg/springframework/kafka/listener/ShareKafkaMessageListenerContainerIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@
@EmbeddedKafka(
topics = {"share-listener-integration-test"}, partitions = 1,
brokerProperties = {
"unstable.api.versions.enable=true",
"group.coordinator.rebalance.protocols=classic,share",
"share.coordinator.state.topic.replication.factor=1",
"share.coordinator.state.topic.min.isr=1"
}
Expand Down
10 changes: 8 additions & 2 deletions ...test/java/org/springframework/kafka/support/serializer/SerializationIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.regex.Pattern;

import org.apache.kafka.common.header.Headers;
import org.apache.kafka.common.internals.Plugin;
import org.apache.kafka.common.serialization.Deserializer;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.junit.jupiter.api.Test;
Expand All @@ -37,6 +38,7 @@

/**
* @author Gary Russell
* @author Soby Chacko
* @since 2.8.1
*
*/
Expand All @@ -46,6 +48,7 @@ public class SerializationIntegrationTests {
public static final String DBTD_TOPIC = "dbtd";

@Test
@SuppressWarnings("unchecked")
void configurePreLoadedDelegates() {
Map<String, Object> consumerProps =
KafkaTestUtils.consumerProps(EmbeddedKafkaCondition.getBroker(), DBTD_TOPIC, false);
Expand All @@ -63,8 +66,11 @@ void configurePreLoadedDelegates() {
props.setMessageListener(mock(MessageListener.class));
KafkaMessageListenerContainer<String, Object> container = new KafkaMessageListenerContainer<>(cFact, props);
container.start();
assertThat(KafkaTestUtils.getPropertyValue(container,
"listenerConsumer.consumer.delegate.deserializers.valueDeserializer"))
//The Deserializers class uses a plugin mechanism to retrieve the actual deserializer.
Plugin<Deserializer<?>> valueDeserializerPlugin = (Plugin<Deserializer<?>>) KafkaTestUtils.getPropertyValue(container,
"listenerConsumer.consumer.delegate.deserializers.valueDeserializerPlugin");
assertThat(valueDeserializerPlugin).isNotNull();
assertThat(valueDeserializerPlugin.get())
.isSameAs(delegating);
Map<?, ?> delegates = KafkaTestUtils.getPropertyValue(delegating, "delegates", Map.class);
assertThat(delegates).hasSize(1);
Expand Down