Remove reflection so that GraalVM native-image does not need a hint.

flx5 · flx5 · commit bca88326e625 · 2024-06-09T18:37:51.000+02:00
Signed-off-by: flx5 &lt;1330854+flx5@users.noreply.github.com&gt;
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeAttributePropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeAttributePropertyInfoImpl.java
@@ -13,6 +13,9 @@
 import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeAttributePropertyInfo;
 import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeNonElement;
 import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo;
+import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl;
+import org.glassfish.jaxb.runtime.v2.runtime.property.AttributeProperty;
+import org.glassfish.jaxb.runtime.v2.runtime.property.Property;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeValuePropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeValuePropertyInfoImpl.java
@@ -13,6 +13,9 @@
 import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeNonElement;
 import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo;
 import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeValuePropertyInfo;
+import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl;
+import org.glassfish.jaxb.runtime.v2.runtime.property.Property;
+import org.glassfish.jaxb.runtime.v2.runtime.property.ValueProperty;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeAttributePropertyInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeAttributePropertyInfo.java
@@ -11,6 +11,9 @@
 package org.glassfish.jaxb.runtime.v2.model.runtime;
 
 import org.glassfish.jaxb.core.v2.model.core.AttributePropertyInfo;
+import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl;
+import org.glassfish.jaxb.runtime.v2.runtime.property.AttributeProperty;
+import org.glassfish.jaxb.runtime.v2.runtime.property.Property;
 
 import java.lang.reflect.Type;
 
@@ -21,4 +24,10 @@ public interface RuntimeAttributePropertyInfo extends AttributePropertyInfo<Type
     // refinement
     @Override
     RuntimeNonElement getTarget();
+
+
+    @Override
+    default Property<?> create(JAXBContextImpl grammar) {
+        return new AttributeProperty<>(grammar, this);
+    }
 }
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeElementPropertyInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeElementPropertyInfo.java
@@ -11,6 +11,14 @@
 package org.glassfish.jaxb.runtime.v2.model.runtime;
 
 import org.glassfish.jaxb.core.v2.model.core.ElementPropertyInfo;
+import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl;
+import org.glassfish.jaxb.runtime.v2.runtime.property.ArrayElementLeafProperty;
+import org.glassfish.jaxb.runtime.v2.runtime.property.ArrayElementNodeProperty;
+import org.glassfish.jaxb.runtime.v2.runtime.property.ListElementProperty;
+import org.glassfish.jaxb.runtime.v2.runtime.property.Property;
+import org.glassfish.jaxb.runtime.v2.runtime.property.PropertyFactory;
+import org.glassfish.jaxb.runtime.v2.runtime.property.SingleElementLeafProperty;
+import org.glassfish.jaxb.runtime.v2.runtime.property.SingleElementNodeProperty;
 
 import java.lang.reflect.Type;
 import java.util.Collection;
@@ -25,4 +33,19 @@ public interface RuntimeElementPropertyInfo extends ElementPropertyInfo<Type,Cla
 
     @Override
     List<? extends RuntimeTypeRef> getTypes();
+
+    @Override
+    default Property<?> create(JAXBContextImpl grammar) {
+        if(this.isValueList())
+            return new ListElementProperty<>(grammar, this);
+
+        boolean isLeaf = PropertyFactory.isLeaf(this);
+        boolean isCollection = this.isCollection();
+
+        if (isLeaf) {
+            return isCollection ? new ArrayElementLeafProperty<>(grammar, this) : new SingleElementLeafProperty<>(grammar, this);
+        }
+
+        return isCollection ? new ArrayElementNodeProperty<>(grammar, this) : new SingleElementNodeProperty<>(grammar, this);
+    }
 }
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeMapPropertyInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeMapPropertyInfo.java
@@ -11,6 +11,10 @@
 package org.glassfish.jaxb.runtime.v2.model.runtime;
 
 import org.glassfish.jaxb.core.v2.model.core.MapPropertyInfo;
+import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl;
+import org.glassfish.jaxb.runtime.v2.runtime.property.AttributeProperty;
+import org.glassfish.jaxb.runtime.v2.runtime.property.Property;
+import org.glassfish.jaxb.runtime.v2.runtime.property.SingleMapNodeProperty;
 
 import java.lang.reflect.Type;
 
@@ -22,4 +26,10 @@ public interface RuntimeMapPropertyInfo extends RuntimePropertyInfo, MapProperty
     RuntimeNonElement getKeyType();
     @Override
     RuntimeNonElement getValueType();
+
+
+    @Override
+    default Property<?> create(JAXBContextImpl grammar) {
+        return new SingleMapNodeProperty<>(grammar, this);
+    }
 }
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimePropertyInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimePropertyInfo.java
@@ -12,6 +12,7 @@
 
 import org.glassfish.jaxb.core.v2.model.core.PropertyInfo;
 import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl;
+import org.glassfish.jaxb.runtime.v2.runtime.property.Property;
 import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor;
 
 import java.lang.reflect.Type;
@@ -78,4 +79,6 @@ public interface RuntimePropertyInfo extends PropertyInfo<Type,Class> {
      * @return always non-null.
      */
     Type getIndividualType();
+
+    Property<?> create(JAXBContextImpl grammar);
 }
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeReferencePropertyInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeReferencePropertyInfo.java
@@ -11,6 +11,10 @@
 package org.glassfish.jaxb.runtime.v2.model.runtime;
 
 import org.glassfish.jaxb.core.v2.model.core.ReferencePropertyInfo;
+import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl;
+import org.glassfish.jaxb.runtime.v2.runtime.property.ArrayReferenceNodeProperty;
+import org.glassfish.jaxb.runtime.v2.runtime.property.Property;
+import org.glassfish.jaxb.runtime.v2.runtime.property.SingleReferenceNodeProperty;
 
 import java.lang.reflect.Type;
 import java.util.Set;
@@ -21,4 +25,10 @@
 public interface RuntimeReferencePropertyInfo extends ReferencePropertyInfo<Type,Class>, RuntimePropertyInfo {
     @Override
     Set<? extends RuntimeElement> getElements();
+
+    @Override
+    default Property<?> create(JAXBContextImpl grammar) {
+        boolean isCollection = this.isCollection();
+        return isCollection ? new ArrayReferenceNodeProperty<>(grammar, this) : new SingleReferenceNodeProperty<>(grammar, this);
+    }
 }
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeValuePropertyInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeValuePropertyInfo.java
@@ -11,6 +11,9 @@
 package org.glassfish.jaxb.runtime.v2.model.runtime;
 
 import org.glassfish.jaxb.core.v2.model.core.ValuePropertyInfo;
+import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl;
+import org.glassfish.jaxb.runtime.v2.runtime.property.Property;
+import org.glassfish.jaxb.runtime.v2.runtime.property.ValueProperty;
 
 import java.lang.reflect.Type;
 
@@ -20,4 +23,9 @@
 public interface RuntimeValuePropertyInfo extends ValuePropertyInfo<Type,Class>,RuntimePropertyInfo,RuntimeNonElementRef {
     @Override
     RuntimeNonElement getTarget();
+
+    @Override
+    default Property<?> create(JAXBContextImpl grammar) {
+        return new ValueProperty<>(grammar, this);
+    }
 }
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayElementLeafProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayElementLeafProperty.java
@@ -30,7 +30,7 @@
  *
  * @author Kohsuke Kawaguchi (kk@kohsuke.org)
  */
-final class ArrayElementLeafProperty<BeanT,ListT,ItemT> extends ArrayElementProperty<BeanT,ListT,ItemT> {
+public final class ArrayElementLeafProperty<BeanT,ListT,ItemT> extends ArrayElementProperty<BeanT,ListT,ItemT> {
 
     private final Transducer<ItemT> xducer;
 
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayElementNodeProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayElementNodeProperty.java
@@ -24,7 +24,7 @@
  *
  * @author Kohsuke Kawaguchi
  */
-final class ArrayElementNodeProperty<BeanT,ListT,ItemT> extends ArrayElementProperty<BeanT,ListT,ItemT> {
+public final class ArrayElementNodeProperty<BeanT,ListT,ItemT> extends ArrayElementProperty<BeanT,ListT,ItemT> {
 
     public ArrayElementNodeProperty(JAXBContextImpl p, RuntimeElementPropertyInfo prop) {
         super(p, prop);
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayReferenceNodeProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayReferenceNodeProperty.java
@@ -32,7 +32,7 @@
 /**
  * @author Kohsuke Kawaguchi
  */
-class ArrayReferenceNodeProperty<BeanT,ListT,ItemT> extends ArrayERProperty<BeanT,ListT,ItemT> {
+public class ArrayReferenceNodeProperty<BeanT,ListT,ItemT> extends ArrayERProperty<BeanT,ListT,ItemT> {
 
     /**
      * Expected element names and what class to unmarshal.
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ListElementProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ListElementProperty.java
@@ -38,7 +38,7 @@
  *
  * @author Kohsuke Kawaguchi
  */
-final class ListElementProperty<BeanT,ListT,ItemT> extends ArrayProperty<BeanT,ListT,ItemT> {
+public final class ListElementProperty<BeanT,ListT,ItemT> extends ArrayProperty<BeanT,ListT,ItemT> {
 
     private final Name tagName;
     private final String defaultValue;
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/PropertyFactory.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/PropertyFactory.java
@@ -12,12 +12,9 @@
 
 import org.glassfish.jaxb.core.v2.model.core.ClassInfo;
 import org.glassfish.jaxb.core.v2.model.core.ID;
-import org.glassfish.jaxb.core.v2.model.core.PropertyKind;
 import org.glassfish.jaxb.runtime.v2.model.runtime.*;
 import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
 
 /**
@@ -28,90 +25,19 @@
 public abstract class PropertyFactory {
     private PropertyFactory() {}
 
-
-    /**
-     * Constructors of the {@link Property} implementation.
-     */
-    private static final Constructor<? extends Property>[] propImpls;
-
-    static {
-        Class<? extends Property>[] implClasses = new Class[] {
-            SingleElementLeafProperty.class,
-            null, // single reference leaf --- but there's no such thing as "reference leaf"
-            null, // no such thing as "map leaf"
-
-            ArrayElementLeafProperty.class,
-            null, // array reference leaf --- but there's no such thing as "reference leaf"
-            null, // no such thing as "map leaf"
-
-            SingleElementNodeProperty.class,
-            SingleReferenceNodeProperty.class,
-            SingleMapNodeProperty.class,
-
-            ArrayElementNodeProperty.class,
-            ArrayReferenceNodeProperty.class,
-            null, // map is always a single property (Map doesn't implement Collection)
-        };
-
-        propImpls = new Constructor[implClasses.length];
-        for( int i=0; i<propImpls.length; i++ ) {
-            if(implClasses[i]!=null)
-                // this pointless casting necessary for Mustang
-                propImpls[i] = (Constructor)implClasses[i].getConstructors()[0];
-        }
-    }
-
     /**
      * Creates/obtains a properly configured {@link Property}
      * object from the given description.
      */
-    public static Property create( JAXBContextImpl grammar, RuntimePropertyInfo info ) {
-
-        PropertyKind kind = info.kind();
-
-        switch(kind) {
-        case ATTRIBUTE:
-            return new AttributeProperty(grammar,(RuntimeAttributePropertyInfo)info);
-        case VALUE:
-            return new ValueProperty(grammar,(RuntimeValuePropertyInfo)info);
-        case ELEMENT:
-            if(((RuntimeElementPropertyInfo)info).isValueList())
-                return new ListElementProperty(grammar,(RuntimeElementPropertyInfo) info);
-            break;
-        case REFERENCE:
-        case MAP:
-            break;
-        default:
-            assert false;
-        }
-
-
-        boolean isCollection = info.isCollection();
-        boolean isLeaf = isLeaf(info);
-
-        Constructor<? extends Property> c = propImpls[(isLeaf?0:6)+(isCollection?3:0)+kind.propertyIndex];
-        try {
-            return c.newInstance( grammar, info );
-        } catch (InstantiationException e) {
-            throw new InstantiationError(e.getMessage());
-        } catch (IllegalAccessException e) {
-            throw new IllegalAccessError(e.getMessage());
-        } catch (InvocationTargetException e) {
-            Throwable t = e.getCause();
-            if(t instanceof Error)
-                throw (Error)t;
-            if(t instanceof RuntimeException)
-                throw (RuntimeException)t;
-
-            throw new AssertionError(t);
-        }
+    public static Property create( JAXBContextImpl grammar, RuntimePropertyInfo info) {
+            return info.create(grammar);
     }
 
     /**
      * Look for the case that can be optimized as a leaf,
      * which is a kind of type whose XML representation is just PCDATA.
      */
-    static boolean isLeaf(RuntimePropertyInfo info) {
+    public static boolean isLeaf(RuntimePropertyInfo info) {
         Collection<? extends RuntimeTypeInfo> types = info.ref();
         if(types.size()!=1)     return false;
 
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleElementLeafProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleElementLeafProperty.java
@@ -34,7 +34,7 @@
  *
  * @author Kohsuke Kawaguchi (kk@kohsuke.org)
  */
-final class SingleElementLeafProperty<BeanT> extends PropertyImpl<BeanT> {
+public final class SingleElementLeafProperty<BeanT> extends PropertyImpl<BeanT> {
 
     private final Name tagName;
     private final boolean nillable;
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleElementNodeProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleElementNodeProperty.java
@@ -40,7 +40,7 @@
 /**
  * @author Kohsuke Kawaguchi (kk@kohsuke.org)
  */
-final class SingleElementNodeProperty<BeanT,ValueT> extends PropertyImpl<BeanT> {
+public final class SingleElementNodeProperty<BeanT,ValueT> extends PropertyImpl<BeanT> {
 
     private final Accessor<BeanT,ValueT> acc;
 
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleMapNodeProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleMapNodeProperty.java
@@ -31,7 +31,7 @@
 /**
  * @author Kohsuke Kawaguchi
  */
-final class SingleMapNodeProperty<BeanT,ValueT extends Map> extends PropertyImpl<BeanT> {
+public final class SingleMapNodeProperty<BeanT,ValueT extends Map> extends PropertyImpl<BeanT> {
 
     private final Accessor<BeanT,ValueT> acc;
     /**
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleReferenceNodeProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleReferenceNodeProperty.java
@@ -35,7 +35,7 @@
 /**
  * @author Kohsuke Kawaguchi
  */
-final class SingleReferenceNodeProperty<BeanT,ValueT> extends PropertyImpl<BeanT> {
+public final class SingleReferenceNodeProperty<BeanT,ValueT> extends PropertyImpl<BeanT> {
 
     private final Accessor<BeanT,ValueT> acc;
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`*`
`31`	`31`	`* @author Kohsuke Kawaguchi (kk@kohsuke.org)`
`32`	`32`	`*/`
`33`		`-final class ArrayElementLeafProperty<BeanT,ListT,ItemT> extends ArrayElementProperty<BeanT,ListT,ItemT> {`
	`33`	`+public final class ArrayElementLeafProperty<BeanT,ListT,ItemT> extends ArrayElementProperty<BeanT,ListT,ItemT> {`
`34`	`34`
`35`	`35`	`private final Transducer<ItemT> xducer;`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*`
`25`	`25`	`* @author Kohsuke Kawaguchi`
`26`	`26`	`*/`
`27`		`-final class ArrayElementNodeProperty<BeanT,ListT,ItemT> extends ArrayElementProperty<BeanT,ListT,ItemT> {`
	`27`	`+public final class ArrayElementNodeProperty<BeanT,ListT,ItemT> extends ArrayElementProperty<BeanT,ListT,ItemT> {`
`28`	`28`
`29`	`29`	`public ArrayElementNodeProperty(JAXBContextImpl p, RuntimeElementPropertyInfo prop) {`
`30`	`30`	`super(p, prop);`