diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java index 44d4dd90493e..0aec4ef5f943 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java @@ -124,6 +124,7 @@ protected final JAXBContext getJaxbContext(Class clazz) { * Detect the charset from the given {@link HttpHeaders#getContentType()}. * @param httpHeaders the current HTTP headers * @return the charset defined in the content type header, or {@code null} if not found + * @since 6.2.8 */ protected @Nullable Charset detectCharset(HttpHeaders httpHeaders) { MediaType contentType = httpHeaders.getContentType(); diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java index 101996df1473..000c0374c580 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java @@ -160,6 +160,13 @@ protected Object readFromSource(Class clazz, HttpHeaders headers, Source sour } } + /** + * Process {@code source} with {@code charset}. + * @param source source to process + * @param charset charset to use + * @return source + * @since 6.2.8 + */ protected Source processSource(Source source, @Nullable Charset charset) { if (source instanceof StreamSource streamSource) { InputSource inputSource = new InputSource(streamSource.getInputStream());