From bbae625850d42bcb2763935be042f1387fd42cf4 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Sun, 25 May 2025 14:18:25 +0900 Subject: [PATCH] Add Javadoc since for gh-34745 Closes gh-34940 Signed-off-by: Johnny Lim --- .../converter/xml/AbstractJaxb2HttpMessageConverter.java | 1 + .../xml/Jaxb2RootElementHttpMessageConverter.java | 7 +++++++ 2 files changed, 8 insertions(+) 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 da74365382d..ab5f6dfa335 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 @@ public abstract class AbstractJaxb2HttpMessageConverter extends AbstractXmlHt * 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 */ @Nullable protected Charset detectCharset(HttpHeaders httpHeaders) { 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 5417b28500c..d81a15f9ff9 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 @@ -161,6 +161,13 @@ public class Jaxb2RootElementHttpMessageConverter extends AbstractJaxb2HttpMessa } } + /** + * 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());