SPR-6371 - Jaxb2Marshaller should use AnnotationUtils

Author: poutsma

org.springframework.oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java

@@ -63,6 +63,7 @@
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.io.Resource;
 import org.springframework.oxm.MarshallingFailureException;
 import org.springframework.oxm.UncategorizedMappingException;
@@ -369,7 +370,7 @@ public boolean supports(Class<?> clazz) {
 		if (JAXBElement.class.isAssignableFrom(clazz)) {
 			return true;
 		}
-		else if (clazz.getAnnotation(XmlRootElement.class) != null) {
+		else if (AnnotationUtils.findAnnotation(clazz, XmlRootElement.class) != null) {
 			return true;
 		}
 		if (StringUtils.hasLength(this.contextPath)) {

org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java

@@ -184,4 +184,20 @@ public void marshalAttachments() throws Exception {
 		verify(mimeContainer);
 		assertTrue("No XML written", writer.toString().length() > 0);
 	}
+
+	@Test
+	public void subclass() throws Exception {
+		assertTrue("Flights subclass is not supported", marshaller.supports(FlightsSubclass.class));
+		FlightType flight = new FlightType();
+		flight.setNumber(42L);
+		FlightsSubclass flights = new FlightsSubclass();
+		flights.getFlight().add(flight);
+		StringWriter writer = new StringWriter();
+		marshaller.marshal(flights, new StreamResult(writer));
+		assertXMLEqual("Marshaller writes invalid StreamResult", EXPECTED_STRING, writer.toString());
+	}
+
+	private static class FlightsSubclass extends Flights {
+
+	}
 }