Merge pull request #32060 from ppalaga/i32059

The quarkus-jaxb extension loads entity classes at build time even though no default JAXBContext will be created within the application
quarkusio · Mar 23, 2023 · 8e40dad · 8e40dad
2 parents 6121033 + e86129c
commit 8e40dad
Showing 1 changed file with 1 addition and 8 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
@@ -314,14 +314,6 @@ FilteredJaxbClassesToBeBoundBuildItem filterBoundClasses(
         return builder.build();
     }
 
-    @BuildStep
-    @Record(ExecutionTime.STATIC_INIT)
-    void setupJaxbContextConfig(
-            FilteredJaxbClassesToBeBoundBuildItem filteredClassesToBeBound,
-            JaxbContextConfigRecorder jaxbContextConfig) {
-        jaxbContextConfig.addClassesToBeBound(filteredClassesToBeBound.getClasses());
-    }
-
     @BuildStep
     @Record(ExecutionTime.STATIC_INIT)
     void validateDefaultJaxbContext(
@@ -335,6 +327,7 @@ void validateDefaultJaxbContext(
             final Set<BeanInfo> beans = beanResolver
                     .resolveBeans(Type.create(DotName.createSimple(JAXBContext.class), org.jboss.jandex.Type.Kind.CLASS));
             if (!beans.isEmpty()) {
+                jaxbContextConfig.addClassesToBeBound(filteredClassesToBeBound.getClasses());
                 final BeanInfo bean = beanResolver.resolveAmbiguity(beans);
                 if (bean.isDefaultBean()) {
                     /*