Skip to content
This repository was archived by the owner on Nov 20, 2024. It is now read-only.

Commit 01dbb49

Browse files
committed
Revert "Update Kafka client version to 3.1.0"
This reverts commit a25e2ea.
1 parent 65960e1 commit 01dbb49

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<java.version>17</java.version>
2424
<spring-kafka.version>3.0.0-SNAPSHOT</spring-kafka.version>
2525
<spring-integration-kafka.version>6.0.0-SNAPSHOT</spring-integration-kafka.version>
26-
<kafka.version>3.1.0</kafka.version>
26+
<kafka.version>3.0.0</kafka.version>
2727
<spring-cloud-stream.version>4.0.0-SNAPSHOT</spring-cloud-stream.version>
2828
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
2929
<maven-checkstyle-plugin.failsOnViolation>true</maven-checkstyle-plugin.failsOnViolation>

spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/bootstrap/KafkaStreamsBinderBootstrapTest.java

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,15 @@
3131
import org.junit.ClassRule;
3232
import org.junit.Test;
3333

34+
import org.springframework.beans.DirectFieldAccessor;
3435
import org.springframework.boot.WebApplicationType;
3536
import org.springframework.boot.autoconfigure.SpringBootApplication;
3637
import org.springframework.boot.builder.SpringApplicationBuilder;
3738
import org.springframework.cloud.stream.binder.kafka.streams.KeyValueSerdeResolver;
3839
import org.springframework.context.ConfigurableApplicationContext;
3940
import org.springframework.context.annotation.Bean;
4041
import org.springframework.kafka.config.StreamsBuilderFactoryBean;
42+
import org.springframework.kafka.support.mapping.DefaultJackson2JavaTypeMapper;
4143
import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
4244

4345
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -141,19 +143,18 @@ public void testStreamConfigGlobalProperties_GH1149() {
141143
assertThat(streamsConfiguration3.containsKey("spring.json.value.type.method")).isFalse();
142144
applicationContext.getBean(KeyValueSerdeResolver.class);
143145

144-
//TODO: In Kafka Streams 3.1, taskTopology field is removed. Re-evaluate this testing strategy.
145-
// String configuredSerdeTypeResolver = (String) new DirectFieldAccessor(input2SBFB.getKafkaStreams())
146-
// .getPropertyValue("taskTopology.processorNodes[0].valDeserializer.typeResolver.arg$2");
147-
//
148-
// assertThat(this.getClass().getName() + ".determineType").isEqualTo(configuredSerdeTypeResolver);
149-
//
150-
// String configuredKeyDeserializerFieldName = ((String) new DirectFieldAccessor(input2SBFB.getKafkaStreams())
151-
// .getPropertyValue("taskTopology.processorNodes[0].keyDeserializer.typeMapper.classIdFieldName"));
152-
// assertThat(DefaultJackson2JavaTypeMapper.KEY_DEFAULT_CLASSID_FIELD_NAME).isEqualTo(configuredKeyDeserializerFieldName);
153-
//
154-
// String configuredValueDeserializerFieldName = ((String) new DirectFieldAccessor(input2SBFB.getKafkaStreams())
155-
// .getPropertyValue("taskTopology.processorNodes[0].valDeserializer.typeMapper.classIdFieldName"));
156-
// assertThat(DefaultJackson2JavaTypeMapper.DEFAULT_CLASSID_FIELD_NAME).isEqualTo(configuredValueDeserializerFieldName);
146+
String configuredSerdeTypeResolver = (String) new DirectFieldAccessor(input2SBFB.getKafkaStreams())
147+
.getPropertyValue("taskTopology.processorNodes[0].valDeserializer.typeResolver.arg$2");
148+
149+
assertThat(this.getClass().getName() + ".determineType").isEqualTo(configuredSerdeTypeResolver);
150+
151+
String configuredKeyDeserializerFieldName = ((String) new DirectFieldAccessor(input2SBFB.getKafkaStreams())
152+
.getPropertyValue("taskTopology.processorNodes[0].keyDeserializer.typeMapper.classIdFieldName"));
153+
assertThat(DefaultJackson2JavaTypeMapper.KEY_DEFAULT_CLASSID_FIELD_NAME).isEqualTo(configuredKeyDeserializerFieldName);
154+
155+
String configuredValueDeserializerFieldName = ((String) new DirectFieldAccessor(input2SBFB.getKafkaStreams())
156+
.getPropertyValue("taskTopology.processorNodes[0].valDeserializer.typeMapper.classIdFieldName"));
157+
assertThat(DefaultJackson2JavaTypeMapper.DEFAULT_CLASSID_FIELD_NAME).isEqualTo(configuredValueDeserializerFieldName);
157158

158159
applicationContext.close();
159160
}

0 commit comments

Comments
 (0)