spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-18 00:49:02 +00:00
Code Issues Projects Releases Wiki Activity

Fix handling of ServerSentEvent with Jackson encoder

Browse Source 
This commit fixes ServerSentEvent handling with Jackson encoder
when no Accept header is specified.

It also moves the String checks to the JSON codec level, as they do not
make sense for binary formats.

Closes gh-35872
This commit is contained in:
Sébastien Deleuze
2025-11-25 13:31:38 +01:00
parent 1b6b163f24
commit c10266e57e
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/http/codec/AbstractJacksonDecoder.java
+1 -8
View File
@@ -102,14 +102,7 @@ public abstract class AbstractJacksonDecoder<T extends ObjectMapper> extends Jac
@Override
public boolean canDecode(ResolvableType elementType, @Nullable MimeType mimeType) {
if (!supportsMimeType(mimeType)) {
return false;
}
T mapper = selectMapper(elementType, mimeType);
if (mapper == null) {
return false;
}
return !CharSequence.class.isAssignableFrom(elementType.toClass());
return supportsMimeType(mimeType) && (selectMapper(elementType, mimeType) != null);
}
@Override
spring-web/src/main/java/org/springframework/http/codec/AbstractJacksonEncoder.java
+3 -6
View File
@@ -126,14 +126,11 @@ public abstract class AbstractJacksonEncoder<T extends ObjectMapper> extends Jac
if (this.mapperRegistrations != null && selectMapper(elementType, mimeType) == null) {
return false;
}
Class<?> clazz = elementType.resolve();
if (clazz == null) {
return true;
}
if (MappingJacksonValue.class.isAssignableFrom(clazz)) {
Class<?> elementClass = elementType.toClass();
if (MappingJacksonValue.class.isAssignableFrom(elementClass)) {
throw new UnsupportedOperationException("MappingJacksonValue is not supported, use hints instead");
}
return !String.class.isAssignableFrom(clazz);
return !ServerSentEvent.class.isAssignableFrom(elementClass);
}
@Override
spring-web/src/main/java/org/springframework/http/codec/json/JacksonJsonDecoder.java
+5
View File
@@ -104,6 +104,11 @@ public class JacksonJsonDecoder extends AbstractJacksonDecoder<JsonMapper> {
super(mapper, mimeTypes);
}
@Override
public boolean canDecode(ResolvableType elementType, @Nullable MimeType mimeType) {
return super.canDecode(elementType, mimeType) && !CharSequence.class.isAssignableFrom(elementType.toClass());
}
@Override
protected Flux<DataBuffer> processInput(Publisher<DataBuffer> input, ResolvableType elementType,
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
spring-web/src/main/java/org/springframework/http/codec/json/JacksonJsonEncoder.java
+5
View File
@@ -121,6 +121,11 @@ public class JacksonJsonEncoder extends AbstractJacksonEncoder<JsonMapper> {
}
@Override
public boolean canEncode(ResolvableType elementType, @Nullable MimeType mimeType) {
return super.canEncode(elementType, mimeType) && !String.class.isAssignableFrom(elementType.toClass());
}
@Override
protected List<MimeType> getMediaTypesForProblemDetail() {
return problemDetailMimeTypes;
spring-web/src/test/java/org/springframework/http/codec/cbor/JacksonCborDecoderTests.java
+1 -1
View File
@@ -57,7 +57,7 @@ class JacksonCborDecoderTests extends AbstractDecoderTests<JacksonCborDecoder> {
assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), MediaType.APPLICATION_CBOR)).isTrue();
assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), null)).isTrue();
assertThat(decoder.canDecode(ResolvableType.forClass(String.class), null)).isFalse();
assertThat(decoder.canDecode(ResolvableType.forClass(String.class), null)).isTrue();
assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), APPLICATION_JSON)).isFalse();
}
spring-web/src/test/java/org/springframework/http/codec/cbor/JacksonCborEncoderTests.java
+1 -1
View File
@@ -59,6 +59,7 @@ class JacksonCborEncoderTests extends AbstractLeakCheckingTests {
ResolvableType pojoType = ResolvableType.forClass(Pojo.class);
assertThat(this.encoder.canEncode(pojoType, MediaType.APPLICATION_CBOR)).isTrue();
assertThat(this.encoder.canEncode(pojoType, null)).isTrue();
assertThat(this.encoder.canEncode(ResolvableType.forClass(String.class), null)).isTrue();
// SPR-15464
assertThat(this.encoder.canEncode(ResolvableType.NONE, null)).isTrue();
@@ -66,7 +67,6 @@ class JacksonCborEncoderTests extends AbstractLeakCheckingTests {
@Test
void canNotEncode() {
assertThat(this.encoder.canEncode(ResolvableType.forClass(String.class), null)).isFalse();
assertThat(this.encoder.canEncode(ResolvableType.forClass(Pojo.class), APPLICATION_XML)).isFalse();
}
spring-web/src/test/java/org/springframework/http/codec/smile/JacksonSmileDecoderTests.java
+1 -1
View File
@@ -62,7 +62,7 @@ class JacksonSmileDecoderTests extends AbstractDecoderTests<JacksonSmileDecoder>
assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), STREAM_SMILE_MIME_TYPE)).isTrue();
assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), null)).isTrue();
assertThat(decoder.canDecode(ResolvableType.forClass(String.class), null)).isFalse();
assertThat(decoder.canDecode(ResolvableType.forClass(String.class), null)).isTrue();
assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), APPLICATION_JSON)).isFalse();
}
spring-web/src/test/java/org/springframework/http/codec/smile/JacksonSmileEncoderTests.java
+2 -1
View File
@@ -65,6 +65,7 @@ class JacksonSmileEncoderTests extends AbstractEncoderTests<JacksonSmileEncoder>
assertThat(this.encoder.canEncode(pojoType, SMILE_MIME_TYPE)).isTrue();
assertThat(this.encoder.canEncode(pojoType, STREAM_SMILE_MIME_TYPE)).isTrue();
assertThat(this.encoder.canEncode(pojoType, null)).isTrue();
assertThat(this.encoder.canEncode(ResolvableType.forClass(String.class), null)).isTrue();
// SPR-15464
assertThat(this.encoder.canEncode(ResolvableType.NONE, null)).isTrue();
@@ -72,7 +73,7 @@ class JacksonSmileEncoderTests extends AbstractEncoderTests<JacksonSmileEncoder>
@Test
void cannotEncode() {
assertThat(this.encoder.canEncode(ResolvableType.forClass(String.class), null)).isFalse();
assertThat(this.encoder.canEncode(ResolvableType.forClass(Pojo.class), APPLICATION_XML)).isFalse();
}
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
-1
View File
@@ -146,7 +146,6 @@ class SseIntegrationTests extends AbstractHttpHandlerIntegrationTests {
Flux<ServerSentEvent<Person>> result = this.webClient.get()
.uri("/event")
.accept(TEXT_EVENT_STREAM)
.retrieve()
.bodyToFlux(new ParameterizedTypeReference<>() {});