Merge pull request #38224 from gsmet/revert-jaxb-hierarchy

Revert "Fixing Jaxb unmarshalling error with native compilation"
quarkusio · Jan 16, 2024 · f59de5a · f59de5a
2 parents c9c90df + ed722a1
commit f59de5a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 101 deletions.
diff --git a/extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java b/extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java
@@ -70,7 +70,6 @@
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyIgnoreWarningBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
@@ -187,7 +186,6 @@ void processAnnotationsAndIndexFiles(
             BuildProducer<NativeImageProxyDefinitionBuildItem> proxyDefinitions,
             CombinedIndexBuildItem combinedIndexBuildItem,
             List<JaxbFileRootBuildItem> fileRoots,
-            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchies,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
             BuildProducer<NativeImageResourceBuildItem> resource,
             BuildProducer<NativeImageResourceBundleBuildItem> resourceBundle,
@@ -204,11 +202,10 @@ void processAnnotationsAndIndexFiles(
         for (DotName jaxbRootAnnotation : JAXB_ROOT_ANNOTATIONS) {
             for (AnnotationInstance jaxbRootAnnotationInstance : index
                     .getAnnotations(jaxbRootAnnotation)) {
-                if (jaxbRootAnnotationInstance.target().kind() == Kind.CLASS
-                        && !JAXB_ANNOTATIONS.contains(jaxbRootAnnotationInstance.target().asClass().getClass())) {
-                    DotName targetClass = jaxbRootAnnotationInstance.target().asClass().name();
-                    addReflectiveHierarchyClass(targetClass, reflectiveHierarchies, index);
-                    classesToBeBound.add(targetClass.toString());
+                if (jaxbRootAnnotationInstance.target().kind() == Kind.CLASS) {
+                    String className = jaxbRootAnnotationInstance.target().asClass().name().toString();
+                    reflectiveClass.produce(ReflectiveClassBuildItem.builder(className).methods().fields().build());
+                    classesToBeBound.add(className);
                     jaxbRootAnnotationsDetected = true;
                 }
             }
@@ -415,17 +412,6 @@ public static Stream<Path> safeWalk(Path p) {
         }
     }
 
-    private void addReflectiveHierarchyClass(DotName className,
-            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy,
-            IndexView index) {
-        Type jandexType = Type.create(className, Type.Kind.CLASS);
-        reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem.Builder()
-                .type(jandexType)
-                .index(index)
-                .source(getClass().getSimpleName() + " > " + jandexType.name().toString())
-                .build());
-    }
-
     private void addReflectiveClass(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, boolean methods, boolean fields,
             String... className) {
         reflectiveClass.produce(new ReflectiveClassBuildItem(methods, fields, className));

diff --git a/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/BookIBANField.java b/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/BookIBANField.java
diff --git a/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/BookWithParent.java b/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/BookWithParent.java
diff --git a/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/JaxbResource.java b/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/JaxbResource.java
@@ -65,19 +65,4 @@ public io.quarkus.it.jaxb.Response seeAlso() {
         return response;
     }
 
-    //Test for Jaxb with parent class field
-    @Path("/bookwithparent")
-    @GET
-    @Produces(MediaType.TEXT_PLAIN)
-    public String getBookWithParent(@QueryParam("name") String name, @QueryParam("iban") String iban) throws JAXBException {
-        BookWithParent bookWithParent = new BookWithParent();
-        bookWithParent.setTitle(name);
-        bookWithParent.setIBAN(iban);
-        JAXBContext context = JAXBContext.newInstance(bookWithParent.getClass());
-        Marshaller marshaller = context.createMarshaller();
-        StringWriter sw = new StringWriter();
-        marshaller.marshal(bookWithParent, sw);
-        return sw.toString();
-    }
-
 }
diff --git a/integration-tests/jaxb/src/test/java/io/quarkus/it/jaxb/JaxbIT.java b/integration-tests/jaxb/src/test/java/io/quarkus/it/jaxb/JaxbIT.java
@@ -1,24 +1,8 @@
 package io.quarkus.it.jaxb;
 
-import static io.restassured.RestAssured.given;
-import static org.hamcrest.Matchers.is;
-
-import org.junit.jupiter.api.Test;
-
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 
 @QuarkusIntegrationTest
 public class JaxbIT extends JaxbTest {
-    //We have to test native executable of Jaxb
-    @Test
-    public void bookWithParent() {
-        given().when()
-                .param("name", "Foundation")
-                .param("iban", "4242")
-                .get("/jaxb/bookwithparent")
-                .then()
-                .statusCode(200)
-                .body(is(
-                        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><bookWithParent><IBAN>4242</IBAN><title>Foundation</title></bookWithParent>"));
-    }
+
 }