Skip to content

Commit cc679a4

Browse files
committed
Use spring-framework:7.0.0-SNAPSHOT
* Fix `MappingJacksonJsonParameterizedConverter` according to changes in super class
1 parent c53960b commit cc679a4

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ext {
7272
springBootVersion = '3.5.0' // docs module
7373
springDataVersion = '2025.1.0-SNAPSHOT'
7474
springRetryVersion = '2.0.12'
75-
springVersion = '7.0.0-M8'
75+
springVersion = '7.0.0-SNAPSHOT'
7676

7777
idPrefix = 'kafka'
7878

spring-kafka/src/main/java/org/springframework/kafka/support/converter/MappingJacksonJsonParameterizedConverter.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
* (generic) types. Based on Jackson 3.
3838
*
3939
* @author Soby Chacko
40+
* @author Artem Bilan
41+
*
4042
* @since 4.0
4143
*/
4244
public class MappingJacksonJsonParameterizedConverter extends JacksonJsonMessageConverter {
@@ -83,20 +85,21 @@ public void setTypeMapper(JacksonJavaTypeMapper typeMapper) {
8385
protected Object convertFromInternal(Message<?> message, Class<?> targetClass, @Nullable Object conversionHint) {
8486
JavaType javaType = determineJavaType(message, conversionHint);
8587
Object value = message.getPayload();
86-
if (value instanceof Bytes) {
87-
value = ((Bytes) value).get();
88+
if (value instanceof Bytes bytesValue) {
89+
value = bytesValue.get();
8890
}
89-
if (value instanceof String) {
91+
92+
if (value instanceof String stringValue) {
9093
try {
91-
return getObjectMapper().readValue((String) value, javaType);
94+
return getJsonMapper().readValue(stringValue, javaType);
9295
}
9396
catch (Exception e) {
9497
throw new ConversionException("Failed to convert from JSON", message, e);
9598
}
9699
}
97-
else if (value instanceof byte[]) {
100+
else if (value instanceof byte[] byteArrayValue) {
98101
try {
99-
return getObjectMapper().readValue((byte[]) value, javaType);
102+
return getJsonMapper().readValue(byteArrayValue, javaType);
100103
}
101104
catch (Exception e) {
102105
throw new ConversionException("Failed to convert from JSON", message, e);

0 commit comments

Comments
 (0)