Remove the substitution for LocatableAnnotation and register proxies

This implementation is important and used by JAXB. We just need to
register proxies for the combinations of JAXB annotations and Locatable.

Author: gsmet

extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java

@@ -2,6 +2,7 @@
 
 import java.io.IOError;
 import java.io.IOException;
+import java.lang.annotation.Annotation;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -48,10 +49,13 @@
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 
+import com.sun.xml.bind.v2.model.annotation.Locatable;
+
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem;
@@ -61,8 +65,7 @@
 
 class JaxbProcessor {
 
-    private static final List<Class<?>> JAXB_REFLECTIVE_CLASSES = Arrays.asList(
-            XmlAccessOrder.class,
+    private static final List<Class<? extends Annotation>> JAXB_ANNOTATIONS = Arrays.asList(
             XmlAccessorType.class,
             XmlAnyAttribute.class,
             XmlAnyElement.class,
@@ -95,6 +98,9 @@ class JaxbProcessor {
             XmlJavaTypeAdapter.class,
             XmlJavaTypeAdapters.class);
 
+    private static final List<Class<?>> JAXB_REFLECTIVE_CLASSES = Arrays.asList(
+            XmlAccessOrder.class);
+
     private static final List<String> JAXB_SERIALIZERS = Arrays.asList(
             "html",
             "text",
@@ -123,6 +129,7 @@ class JaxbProcessor {
     @BuildStep
     void process(BuildProducer<NativeImageSystemPropertyBuildItem> nativeImageProps,
             BuildProducer<ServiceProviderBuildItem> providerItem,
+            BuildProducer<NativeImageProxyDefinitionBuildItem> proxyDefinitions,
             CombinedIndexBuildItem combinedIndexBuildItem,
             List<JaxbFileRootBuildItem> fileRoots) {
 
@@ -176,7 +183,14 @@ void process(BuildProducer<NativeImageSystemPropertyBuildItem> nativeImageProps,
 
         JAXB_REFLECTIVE_CLASSES.stream()
                 .map(Class::getName)
-                .forEach(clazz -> addReflectiveClass(true, false, clazz));
+                .forEach(className -> addReflectiveClass(true, false, className));
+
+        JAXB_ANNOTATIONS.stream()
+                .map(Class::getName)
+                .forEach(className -> {
+                    proxyDefinitions.produce(new NativeImageProxyDefinitionBuildItem(className, Locatable.class.getName()));
+                    addReflectiveClass(true, false, className);
+                });
 
         JAXB_SERIALIZERS.stream()
                 .map(s -> "com/sun/org/apache/xml/internal/serializer/output_" + s + ".properties")

extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/graal/JAXBSubstitutions.java

@@ -8,33 +8,6 @@
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 
-@TargetClass(className = "com.sun.xml.bind.v2.model.annotation.LocatableAnnotation", onlyWith = Target_com_sun_xml_bind_v2_model_annotation_LocatableAnnotation.Selector.class)
-final class Target_com_sun_xml_bind_v2_model_annotation_LocatableAnnotation {
-
-    @Substitute
-    public static <A extends Annotation> A create(A annotation, Locatable parentSourcePos) {
-        return annotation;
-    }
-
-    @TargetClass(className = "com.sun.xml.bind.v2.model.annotation.Locatable", onlyWith = Target_com_sun_xml_bind_v2_model_annotation_LocatableAnnotation.Selector.class)
-    static final class Locatable {
-
-    }
-
-    static final class Selector implements BooleanSupplier {
-
-        @Override
-        public boolean getAsBoolean() {
-            try {
-                Class.forName("com.sun.xml.bind.v2.model.annotation.LocatableAnnotation");
-                return true;
-            } catch (ClassNotFoundException e) {
-                return false;
-            }
-        }
-    }
-}
-
 @TargetClass(className = "com.sun.xml.bind.v2.model.nav.ReflectionNavigator", onlyWith = Target_com_sun_xml_bind_v2_model_nav_ReflectionNavigator.Selector.class)
 final class Target_com_sun_xml_bind_v2_model_nav_ReflectionNavigator {