Polish "Support JAXBElement in Jaxb2RootElementHttpMessageConverter"

See gh-33233

Author: snicoll

spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java

@@ -121,7 +121,9 @@ public boolean canRead(Class<?> clazz, @Nullable MediaType mediaType) {
 
 	@Override
 	public boolean canWrite(Class<?> clazz, @Nullable MediaType mediaType) {
-		return ((JAXBElement.class.isAssignableFrom(clazz) || AnnotationUtils.findAnnotation(clazz, XmlRootElement.class) != null) && canWrite(mediaType));
+		boolean supportedType = (JAXBElement.class.isAssignableFrom(clazz) ||
+				AnnotationUtils.findAnnotation(clazz, XmlRootElement.class) != null);
+		return (supportedType && canWrite(mediaType));
 	}
 
 	@Override
@@ -190,12 +192,12 @@ protected Source processSource(Source source) {
 	}
 
 	@Override
-	protected void writeToResult(Object o, HttpHeaders headers, Result result) throws Exception {
+	protected void writeToResult(Object value, HttpHeaders headers, Result result) throws Exception {
 		try {
-			Class<?> clazz = getMarshallerType(o);
+			Class<?> clazz = getMarshallerType(value);
 			Marshaller marshaller = createMarshaller(clazz);
 			setCharset(headers.getContentType(), marshaller);
-			marshaller.marshal(o, result);
+			marshaller.marshal(value, result);
 		}
 		catch (MarshalException ex) {
 			throw ex;
@@ -205,12 +207,12 @@ protected void writeToResult(Object o, HttpHeaders headers, Result result) throw
 		}
 	}
 
-	private static Class<?> getMarshallerType(Object o) {
-		if (o instanceof JAXBElement<?> jaxbElement) {
+	private static Class<?> getMarshallerType(Object value) {
+		if (value instanceof JAXBElement<?> jaxbElement) {
 			return jaxbElement.getDeclaredType();
 		}
 		else {
-			return ClassUtils.getUserClass(o);
+			return ClassUtils.getUserClass(value);
 		}
 	}