Merge pull request #33924 from Sgitario/33875_good

Support marshalling of JAXBElements in REST Client and Server Reactive

Author: Sgitario

extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SimpleXmlTest.java

@@ -7,6 +7,8 @@
 
 import java.io.StringWriter;
 
+import javax.xml.namespace.QName;
+
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.ws.rs.Consumes;
@@ -18,6 +20,7 @@
 import jakarta.ws.rs.container.Suspended;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.xml.bind.JAXB;
+import jakarta.xml.bind.JAXBElement;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlRootElement;
@@ -178,6 +181,19 @@ public void testResourceUsingModelWithSameName() {
                 .body(is("bb"));
     }
 
+    @Test
+    public void testSupportReturningJaxbElement() {
+        Person response = RestAssured
+                .get("/simple/person-as-jaxb-element")
+                .then()
+                .statusCode(200)
+                .contentType(ContentType.XML)
+                .extract().as(Person.class);
+
+        assertEquals("Bob", response.getFirst());
+        assertEquals("Builder", response.getLast());
+    }
+
     private String toXml(Object person) {
         StringWriter sw = new StringWriter();
         JAXB.marshal(person, sw);
@@ -246,6 +262,13 @@ public Person getPerson() {
             return person;
         }
 
+        @GET
+        @Produces(MediaType.APPLICATION_XML)
+        @Path("/person-as-jaxb-element")
+        public JAXBElement<Person> getPersonAsJaxbElement() {
+            return new JAXBElement<>(new QName("person"), Person.class, getPerson());
+        }
+
         @POST
         @Path("/person")
         @Produces(MediaType.APPLICATION_XML)

extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/runtime/src/main/java/io/quarkus/resteasy/reactive/jaxb/runtime/serialisers/ServerJaxbMessageBodyWriter.java

@@ -55,11 +55,15 @@ public void writeResponse(Object o, Type genericType, ServerRequestContext conte
 
     protected void marshal(Object o, OutputStream outputStream) {
         try {
-            Object jaxbObject = o;
             Class<?> clazz = o.getClass();
-            XmlRootElement jaxbElement = clazz.getAnnotation(XmlRootElement.class);
-            if (jaxbElement == null) {
-                jaxbObject = new JAXBElement(new QName(Introspector.decapitalize(clazz.getSimpleName())), clazz, o);
+            Object jaxbObject = o;
+            if (o instanceof JAXBElement) {
+                clazz = ((JAXBElement<?>) o).getDeclaredType();
+            } else {
+                XmlRootElement jaxbElement = clazz.getAnnotation(XmlRootElement.class);
+                if (jaxbElement == null) {
+                    jaxbObject = new JAXBElement(new QName(Introspector.decapitalize(clazz.getSimpleName())), clazz, o);
+                }
             }
 
             getMarshall(clazz).marshal(jaxbObject, outputStream);

extensions/resteasy-reactive/rest-client-reactive-jaxb/deployment/src/test/java/io/quarkus/rest/client/reactive/jaxb/test/SimpleJaxbTest.java

@@ -5,12 +5,18 @@
 import java.net.URI;
 import java.util.Objects;
 
+import javax.xml.namespace.QName;
+
+import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
+import jakarta.xml.bind.JAXBElement;
 import jakarta.xml.bind.annotation.XmlRootElement;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -26,18 +32,24 @@ public class SimpleJaxbTest {
     @TestHTTPResource
     URI uri;
 
+    XmlClient client;
+
+    @BeforeEach
+    public void setup() {
+        client = QuarkusRestClientBuilder.newBuilder().baseUri(uri).build(XmlClient.class);
+    }
+
     @Test
     void shouldConsumeXMLEntity() {
-        var dto = QuarkusRestClientBuilder.newBuilder().baseUri(uri).build(XmlClient.class)
-                .dto();
-        assertThat(dto).isEqualTo(new Dto("foo", "bar"));
+        assertThat(client.dto()).isEqualTo(new Dto("foo", "bar"));
+        assertThat(client.createDto(new Dto("foo", "bar"))).isEqualTo(new Dto("foo", "bar"));
+        assertThat(client.createDto(new JAXBElement<>(new QName("Dto"), Dto.class, new Dto("foo", "bar"))))
+                .isEqualTo(new Dto("foo", "bar"));
     }
 
     @Test
     void shouldConsumePlainXMLEntity() {
-        var dto = QuarkusRestClientBuilder.newBuilder().baseUri(uri).build(XmlClient.class)
-                .plain();
-        assertThat(dto).isEqualTo(new Dto("foo", "bar"));
+        assertThat(client.plain()).isEqualTo(new Dto("foo", "bar"));
     }
 
     @Path("/xml")
@@ -48,6 +60,18 @@ public interface XmlClient {
         @Produces(MediaType.APPLICATION_XML)
         Dto dto();
 
+        @POST
+        @Path("/dto")
+        @Consumes(MediaType.APPLICATION_XML)
+        @Produces(MediaType.APPLICATION_XML)
+        Dto createDto(Dto dto);
+
+        @POST
+        @Path("/dto")
+        @Consumes(MediaType.APPLICATION_XML)
+        @Produces(MediaType.APPLICATION_XML)
+        Dto createDto(JAXBElement<Dto> dto);
+
         @GET
         @Path("/plain")
         @Produces(MediaType.TEXT_XML)
@@ -67,6 +91,14 @@ public String dto() {
             return DTO_FOO_BAR;
         }
 
+        @POST
+        @Consumes(MediaType.APPLICATION_XML)
+        @Produces(MediaType.APPLICATION_XML)
+        @Path("/dto")
+        public String dto(String dto) {
+            return dto;
+        }
+
         @GET
         @Produces(MediaType.TEXT_XML)
         @Path("/plain")

extensions/resteasy-reactive/rest-client-reactive-jaxb/runtime/src/main/java/io/quarkus/rest/client/reactive/jaxb/runtime/ClientMessageBodyWriter.java

@@ -46,11 +46,13 @@ private void setContentTypeIfNecessary(MultivaluedMap<String, Object> httpHeader
 
     protected void marshal(Object o, OutputStream outputStream) {
         try {
-            Object jaxbObject = o;
             Class<?> clazz = o.getClass();
-            XmlRootElement jaxbElement = clazz.getAnnotation(XmlRootElement.class);
-            if (jaxbElement == null) {
-                jaxbObject = new JAXBElement(new QName(Introspector.decapitalize(clazz.getSimpleName())), clazz, o);
+            Object jaxbObject = o;
+            if (!(o instanceof JAXBElement)) {
+                XmlRootElement jaxbElement = clazz.getAnnotation(XmlRootElement.class);
+                if (jaxbElement == null) {
+                    jaxbObject = new JAXBElement(new QName(Introspector.decapitalize(clazz.getSimpleName())), clazz, o);
+                }
             }
 
             marshaller.marshal(jaxbObject, outputStream);