Skip to content

Jaxb2XmlEncoder does not support JAXBElement subtypes #33258

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

Closed
wants to merge 1 commit into from
Closed

Jaxb2XmlEncoder does not support JAXBElement subtypes #33258

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 spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public boolean canEncode(ResolvableType elementType, @Nullable MimeType mimeType
Class<?> outputClass = elementType.toClass();
return (outputClass.isAnnotationPresent(XmlRootElement.class) ||
outputClass.isAnnotationPresent(XmlType.class) ||
elementType.isAssignableFrom(JAXBElement.class));
JAXBElement.class.isAssignableFrom(outputClass));
}
else {
return false;
Expand Down
12 changes: 12 additions & 0 deletions spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlEncoderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.springframework.http.codec.xml;

import java.io.Serial;
import java.util.Arrays;
import java.util.List;
import java.util.function.Consumer;
Expand Down Expand Up @@ -64,6 +65,7 @@ protected void canEncode() {
assertThat(this.encoder.canEncode(forClass(getClass()), MediaType.APPLICATION_XML)).isFalse();

assertThat(this.encoder.canEncode(forClass(JAXBElement.class), MediaType.APPLICATION_XML)).isTrue();
assertThat(this.encoder.canEncode(forClass(JAXBElementSubclass.class), MediaType.APPLICATION_XML)).isTrue();

// SPR-15464
assertThat(this.encoder.canEncode(ResolvableType.NONE, null)).isFalse();
Expand Down Expand Up @@ -122,6 +124,16 @@ protected Consumer<DataBuffer> expectXml(String expected) {
};
}

public static class JAXBElementSubclass extends JAXBElement<Pojo>{
@Serial
private static final long serialVersionUID = 1L;

protected final static QName NAME = new QName("http://foo/schema/common/1.0", "Pojo");
public JAXBElementSubclass() {
super(NAME, Pojo.class, null, null);
}
}

public static class Model {}

public static class Foo extends Model {
Expand Down