Do not ignore charset in Jaxb2XmlDecoder

This commit makes sure that the charset, if defined in the mimetype, is
used when decoding XML to JAXB2 objects.

Closes gh-28599
This commit is contained in:
Arjen Poutsma
2022-06-13 13:47:31 +02:00
parent e3b288716d
commit c278d8c656
2 changed files with 41 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@ import org.springframework.http.codec.xml.jaxb.XmlRootElementWithNameAndNamespac
import org.springframework.http.codec.xml.jaxb.XmlType;
import org.springframework.http.codec.xml.jaxb.XmlTypeWithName;
import org.springframework.http.codec.xml.jaxb.XmlTypeWithNameAndNamespace;
import org.springframework.util.MimeType;
import org.springframework.web.testfixture.xml.Pojo;
import static org.assertj.core.api.Assertions.assertThat;
@@ -228,6 +229,28 @@ public class Jaxb2XmlDecoderTests extends AbstractLeakCheckingTests {
assertThat(Exceptions.unwrap(ex)).isInstanceOf(DecodingException.class));
}
@Test
public void decodeNonUtf8() {
String xml = "<pojo>" +
"<foo>føø</foo>" +
"<bar>bär</bar>" +
"</pojo>";
Mono<DataBuffer> source = Mono.fromCallable(() -> {
byte[] bytes = xml.getBytes(StandardCharsets.ISO_8859_1);
DataBuffer buffer = this.bufferFactory.allocateBuffer(bytes.length);
buffer.write(bytes);
return buffer;
});
MimeType mimeType = new MimeType(MediaType.APPLICATION_XML, StandardCharsets.ISO_8859_1);
Mono<Object> output = this.decoder.decodeToMono(source, ResolvableType.forClass(TypePojo.class), mimeType,
HINTS);
StepVerifier.create(output)
.expectNext(new TypePojo("føø", "bär"))
.expectComplete()
.verify();
}
@Test
public void toExpectedQName() {
assertThat(this.decoder.toQName(Pojo.class)).isEqualTo(new QName("pojo"));