Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support JAXBElement in Jaxb2RootElementHttpMessageConverter

Browse Source 
See gh-33233
This commit is contained in:
Thomas Deblock
2024-07-18 18:11:13 +02:00
committed by Stéphane Nicoll
parent e4edd3246a
commit a5e2557738
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
View File

@@ -18,6 +18,9 @@ package org.springframework.http.converter.xml;
import java.nio.charset.StandardCharsets;
import javax.xml.namespace.QName;
import jakarta.xml.bind.JAXBElement;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -93,6 +96,8 @@ class Jaxb2RootElementHttpMessageConverterTests {
.as("Converter does not support writing @XmlRootElement subclass").isTrue();
assertThat(converter.canWrite(rootElementCglib.getClass(), null))
.as("Converter does not support writing @XmlRootElement subclass").isTrue();
assertThat(converter.canWrite(JAXBElement.class, null))
.as("Converter does not support writing JAXBElement").isTrue();
assertThat(converter.canWrite(Type.class, null))
.as("Converter supports writing @XmlType").isFalse();
}
@@ -186,6 +191,18 @@ class Jaxb2RootElementHttpMessageConverterTests {
.isSimilarTo("<rootElement><type s=\"Hello World\"/></rootElement>", ev);
}
@Test
void writeJaxbElementRootElement() throws Exception {
MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
JAXBElement jaxbElement = new JAXBElement<>(new QName("custom"), MyCustomElement.class, new MyCustomElement("field1", "field2"));
converter.write(jaxbElement, null, outputMessage);
assertThat(outputMessage.getHeaders().getContentType())
.as("Invalid content-type").isEqualTo(MediaType.APPLICATION_XML);
DifferenceEvaluator ev = chain(Default, downgradeDifferencesToEqual(XML_STANDALONE));
assertThat(XmlContent.of(outputMessage.getBodyAsString(StandardCharsets.UTF_8)))
.isSimilarTo("<custom><field1>field1</field1><field2>field2</field2></custom>", ev);
}
@Test
void writeXmlRootElementSubclass() throws Exception {
MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();