spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Exclude Jackson XML from String encoding/decoding

Browse Source 
Closes gh-36775
This commit is contained in:
rstoyanchev
2026-06-05 14:36:05 +01:00
parent 6ca66afc7b
commit 95bd3f7c67
7 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/http/codec/json/JacksonJsonDecoder.java
+2 -1
View File
@@ -104,9 +104,10 @@ 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());
return (super.canDecode(elementType, mimeType) && String.class != elementType.toClass());
}
@Override
spring-web/src/main/java/org/springframework/http/codec/json/JacksonJsonEncoder.java
+1 -1
View File
@@ -123,7 +123,7 @@ 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());
return (super.canEncode(elementType, mimeType) && String.class != elementType.toClass());
}
@Override
spring-web/src/main/java/org/springframework/http/codec/xml/JacksonXmlDecoder.java
+5
View File
@@ -102,6 +102,11 @@ public class JacksonXmlDecoder extends AbstractJacksonDecoder<XmlMapper> {
}
@Override
public boolean canDecode(ResolvableType elementType, @Nullable MimeType mimeType) {
return (super.canDecode(elementType, mimeType) && String.class != elementType.toClass());
}
@Override
public Flux<Object> decode(Publisher<DataBuffer> input, ResolvableType elementType, @Nullable MimeType mimeType,
@Nullable Map<String, Object> hints) {
spring-web/src/main/java/org/springframework/http/codec/xml/JacksonXmlEncoder.java
+5
View File
@@ -97,6 +97,11 @@ public class JacksonXmlEncoder extends AbstractJacksonEncoder<XmlMapper> {
}
@Override
public boolean canEncode(ResolvableType elementType, @Nullable MimeType mimeType) {
return (super.canEncode(elementType, mimeType) && String.class != elementType.toClass());
}
@Override
public Flux<DataBuffer> encode(Publisher<?> inputStream, DataBufferFactory bufferFactory, ResolvableType elementType,
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
spring-web/src/test/java/org/springframework/http/codec/json/JacksonJsonEncoderTests.java
+1
View File
@@ -90,6 +90,7 @@ class JacksonJsonEncoderTests extends AbstractEncoderTests<JacksonJsonEncoder> {
// SPR-15910
assertThat(this.encoder.canEncode(ResolvableType.forClass(Object.class), APPLICATION_OCTET_STREAM)).isFalse();
assertThat(this.encoder.canEncode(ResolvableType.forClass(String.class), null)).isFalse();
assertThatThrownBy(() -> this.encoder.canEncode(ResolvableType.forClass(MappingJacksonValue.class), APPLICATION_JSON))
.isInstanceOf(UnsupportedOperationException.class);
spring-web/src/test/java/org/springframework/http/codec/xml/JacksonXmlDecoderTests.java
+1 -1
View File
@@ -59,7 +59,7 @@ class JacksonXmlDecoderTests extends AbstractDecoderTests<JacksonXmlDecoder> {
assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), MediaType.TEXT_XML)).isTrue();
assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), new MediaType("application", "soap+xml"))).isTrue();
assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), null)).isTrue();
assertThat(decoder.canDecode(ResolvableType.forClass(String.class), null)).isTrue();
assertThat(decoder.canDecode(ResolvableType.forClass(String.class), null)).isFalse();
assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), MediaType.APPLICATION_JSON)).isFalse();
}
spring-web/src/test/java/org/springframework/http/codec/xml/JacksonXmlEncoderTests.java
+1 -1
View File
@@ -52,7 +52,7 @@ class JacksonXmlEncoderTests extends AbstractLeakCheckingTests {
assertThat(this.encoder.canEncode(pojoType, MediaType.TEXT_XML)).isTrue();
assertThat(this.encoder.canEncode(pojoType, new MediaType("application", "soap+xml"))).isTrue();
assertThat(this.encoder.canEncode(pojoType, null)).isTrue();
assertThat(this.encoder.canEncode(ResolvableType.forClass(String.class), null)).isTrue();
assertThat(this.encoder.canEncode(ResolvableType.forClass(String.class), null)).isFalse();
assertThat(this.encoder.canEncode(ResolvableType.NONE, null)).isTrue();
assertThat(this.encoder.canEncode(ResolvableType.forClass(Pojo.class), MediaType.APPLICATION_JSON)).isFalse();
}