Add support for GraalVM native images #343

vladmihalcea · Sep 5, 2022 · c6ab395 · c6ab395
1 parent 8bb8ae9
commit c6ab395
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 21 deletions.
diff --git a/...es-52/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonTypeDescriptor.java b/...es-52/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonTypeDescriptor.java
@@ -66,7 +66,7 @@ public JsonTypeDescriptor(final ObjectMapperWrapper objectMapperWrapper, Type ty
     public void setParameterValues(Properties parameters) {
         final XProperty xProperty = (XProperty) parameters.get(DynamicParameterizedType.XPROPERTY);
         Type type = (xProperty instanceof JavaXMember) ?
-            ReflectionUtils.invokeGetter(xProperty, "javaType") :
+            ((JavaXMember) xProperty).getJavaType() :
             ((ParameterType) parameters.get(PARAMETER_TYPE)).getReturnedClass();
         setPropertyClass(type);
     }

diff --git a/...ate-types-52/src/main/java/com/vladmihalcea/hibernate/type/range/PostgreSQLRangeType.java b/...ate-types-52/src/main/java/com/vladmihalcea/hibernate/type/range/PostgreSQLRangeType.java
@@ -1,7 +1,6 @@
 package com.vladmihalcea.hibernate.type.range;
 
 import com.vladmihalcea.hibernate.type.ImmutableType;
-import com.vladmihalcea.hibernate.util.ReflectionUtils;
 import org.hibernate.HibernateException;
 import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.annotations.common.reflection.java.JavaXMember;
@@ -128,7 +127,7 @@ private static String determineRangeType(Range<?> range) {
     public void setParameterValues(Properties parameters) {
         final XProperty xProperty = (XProperty) parameters.get(DynamicParameterizedType.XPROPERTY);
         if (xProperty instanceof JavaXMember) {
-            type = ReflectionUtils.invokeGetter(xProperty, "javaType");
+            type = ((JavaXMember) xProperty).getJavaType();
         } else {
             type = ((ParameterType) parameters.get(PARAMETER_TYPE)).getReturnedClass();
         }

diff --git a/...2/src/main/java/com/vladmihalcea/hibernate/type/range/guava/PostgreSQLGuavaRangeType.java b/...2/src/main/java/com/vladmihalcea/hibernate/type/range/guava/PostgreSQLGuavaRangeType.java
@@ -3,7 +3,6 @@
 import com.google.common.collect.BoundType;
 import com.google.common.collect.Range;
 import com.vladmihalcea.hibernate.type.ImmutableType;
-import com.vladmihalcea.hibernate.util.ReflectionUtils;
 import org.hibernate.HibernateException;
 import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.annotations.common.reflection.java.JavaXMember;
@@ -515,7 +514,7 @@ private String asString(Object value) {
     public void setParameterValues(Properties parameters) {
         final XProperty xProperty = (XProperty) parameters.get(DynamicParameterizedType.XPROPERTY);
         if (xProperty instanceof JavaXMember) {
-            type = ReflectionUtils.invokeGetter(xProperty, "javaType");
+            type = ((JavaXMember) xProperty).getJavaType();
         } else {
             type = ((ParameterType) parameters.get(PARAMETER_TYPE)).getReturnedClass();
         }

diff --git a/...ava/com/vladmihalcea/hibernate/type/search/internal/PostgreSQLTSVectorTypeDescriptor.java b/...ava/com/vladmihalcea/hibernate/type/search/internal/PostgreSQLTSVectorTypeDescriptor.java
@@ -1,6 +1,5 @@
 package com.vladmihalcea.hibernate.type.search.internal;
 
-import com.vladmihalcea.hibernate.util.ReflectionUtils;
 import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.annotations.common.reflection.java.JavaXMember;
 import org.hibernate.type.descriptor.WrapperOptions;
@@ -24,7 +23,7 @@ public PostgreSQLTSVectorTypeDescriptor() {
     public void setParameterValues(Properties parameters) {
         final XProperty xProperty = (XProperty) parameters.get(DynamicParameterizedType.XPROPERTY);
         if (xProperty instanceof JavaXMember) {
-            type = ReflectionUtils.invokeGetter(xProperty, "javaType");
+            type = ((JavaXMember) xProperty).getJavaType();
         } else {
             type = ((ParameterType) parameters.get(PARAMETER_TYPE)).getReturnedClass();
         }

diff --git a/...es-55/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonTypeDescriptor.java b/...es-55/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonTypeDescriptor.java
@@ -66,7 +66,7 @@ public JsonTypeDescriptor(final ObjectMapperWrapper objectMapperWrapper, Type ty
     public void setParameterValues(Properties parameters) {
         final XProperty xProperty = (XProperty) parameters.get(DynamicParameterizedType.XPROPERTY);
         Type type = (xProperty instanceof JavaXMember) ?
-            ReflectionUtils.invokeGetter(xProperty, "javaType") :
+            ((JavaXMember) xProperty).getJavaType() :
             ((ParameterType) parameters.get(PARAMETER_TYPE)).getReturnedClass();
         setPropertyClass(type);
     }

diff --git a/...ate-types-55/src/main/java/com/vladmihalcea/hibernate/type/range/PostgreSQLRangeType.java b/...ate-types-55/src/main/java/com/vladmihalcea/hibernate/type/range/PostgreSQLRangeType.java
@@ -2,7 +2,6 @@
 
 import com.vladmihalcea.hibernate.type.ImmutableType;
 import com.vladmihalcea.hibernate.type.util.Configuration;
-import com.vladmihalcea.hibernate.util.ReflectionUtils;
 import org.hibernate.HibernateException;
 import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.annotations.common.reflection.java.JavaXMember;
@@ -133,7 +132,7 @@ private static String determineRangeType(Range<?> range) {
     public void setParameterValues(Properties parameters) {
         final XProperty xProperty = (XProperty) parameters.get(DynamicParameterizedType.XPROPERTY);
         if (xProperty instanceof JavaXMember) {
-            type = ReflectionUtils.invokeGetter(xProperty, "javaType");
+            type = ((JavaXMember) xProperty).getJavaType();
         } else {
             type = ((ParameterType) parameters.get(PARAMETER_TYPE)).getReturnedClass();
         }

diff --git a/...5/src/main/java/com/vladmihalcea/hibernate/type/range/guava/PostgreSQLGuavaRangeType.java b/...5/src/main/java/com/vladmihalcea/hibernate/type/range/guava/PostgreSQLGuavaRangeType.java
@@ -3,7 +3,6 @@
 import com.google.common.collect.BoundType;
 import com.google.common.collect.Range;
 import com.vladmihalcea.hibernate.type.ImmutableType;
-import com.vladmihalcea.hibernate.util.ReflectionUtils;
 import org.hibernate.HibernateException;
 import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.annotations.common.reflection.java.JavaXMember;
@@ -515,7 +514,7 @@ private String asString(Object value) {
     public void setParameterValues(Properties parameters) {
         final XProperty xProperty = (XProperty) parameters.get(DynamicParameterizedType.XPROPERTY);
         if (xProperty instanceof JavaXMember) {
-            type = ReflectionUtils.invokeGetter(xProperty, "javaType");
+            type = ((JavaXMember) xProperty).getJavaType();
         } else {
             type = ((ParameterType) parameters.get(PARAMETER_TYPE)).getReturnedClass();
         }

diff --git a/...ava/com/vladmihalcea/hibernate/type/search/internal/PostgreSQLTSVectorTypeDescriptor.java b/...ava/com/vladmihalcea/hibernate/type/search/internal/PostgreSQLTSVectorTypeDescriptor.java
@@ -1,6 +1,5 @@
 package com.vladmihalcea.hibernate.type.search.internal;
 
-import com.vladmihalcea.hibernate.util.ReflectionUtils;
 import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.annotations.common.reflection.java.JavaXMember;
 import org.hibernate.type.descriptor.WrapperOptions;
@@ -24,7 +23,7 @@ public PostgreSQLTSVectorTypeDescriptor() {
     public void setParameterValues(Properties parameters) {
         final XProperty xProperty = (XProperty) parameters.get(DynamicParameterizedType.XPROPERTY);
         if (xProperty instanceof JavaXMember) {
-            type = ReflectionUtils.invokeGetter(xProperty, "javaType");
+            type = ((JavaXMember) xProperty).getJavaType();
         } else {
             type = ((ParameterType) parameters.get(PARAMETER_TYPE)).getReturnedClass();
         }

diff --git a/hibernate-types-60/pom.xml b/hibernate-types-60/pom.xml
@@ -61,6 +61,12 @@
             <artifactId>ehcache</artifactId>
             <version>${ehcache.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.glassfish.jaxb</groupId>
+                    <artifactId>jaxb-runtime</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

diff --git a/...0/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonJavaTypeDescriptor.java b/...0/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonJavaTypeDescriptor.java
@@ -73,7 +73,7 @@ public JsonJavaTypeDescriptor(final ObjectMapperWrapper objectMapperWrapper, Typ
     public void setParameterValues(Properties parameters) {
         final XProperty xProperty = (XProperty) parameters.get(DynamicParameterizedType.XPROPERTY);
         Type type = (xProperty instanceof JavaXMember) ?
-            ReflectionUtils.invokeGetter(xProperty, "javaType") :
+            ((JavaXMember) xProperty).getJavaType() :
             ((ParameterType) parameters.get(PARAMETER_TYPE)).getReturnedClass();
         setPropertyClass(type);
     }

diff --git a/...ate-types-60/src/main/java/com/vladmihalcea/hibernate/type/range/PostgreSQLRangeType.java b/...ate-types-60/src/main/java/com/vladmihalcea/hibernate/type/range/PostgreSQLRangeType.java
@@ -2,7 +2,6 @@
 
 import com.vladmihalcea.hibernate.type.ImmutableType;
 import com.vladmihalcea.hibernate.type.util.Configuration;
-import com.vladmihalcea.hibernate.util.ReflectionUtils;
 import org.hibernate.HibernateException;
 import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.annotations.common.reflection.java.JavaXMember;
@@ -133,7 +132,7 @@ private static String determineRangeType(Range<?> range) {
     public void setParameterValues(Properties parameters) {
         final XProperty xProperty = (XProperty) parameters.get(DynamicParameterizedType.XPROPERTY);
         if (xProperty instanceof JavaXMember) {
-            type = ReflectionUtils.invokeGetter(xProperty, "javaType");
+            type = ((JavaXMember) xProperty).getJavaType();
         } else {
             type = ((ParameterType) parameters.get(PARAMETER_TYPE)).getReturnedClass();
         }

diff --git a/...0/src/main/java/com/vladmihalcea/hibernate/type/range/guava/PostgreSQLGuavaRangeType.java b/...0/src/main/java/com/vladmihalcea/hibernate/type/range/guava/PostgreSQLGuavaRangeType.java
@@ -3,7 +3,6 @@
 import com.google.common.collect.BoundType;
 import com.google.common.collect.Range;
 import com.vladmihalcea.hibernate.type.ImmutableType;
-import com.vladmihalcea.hibernate.util.ReflectionUtils;
 import org.hibernate.HibernateException;
 import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.annotations.common.reflection.java.JavaXMember;
@@ -515,7 +514,7 @@ private String asString(Object value) {
     public void setParameterValues(Properties parameters) {
         final XProperty xProperty = (XProperty) parameters.get(DynamicParameterizedType.XPROPERTY);
         if (xProperty instanceof JavaXMember) {
-            type = ReflectionUtils.invokeGetter(xProperty, "javaType");
+            type = ((JavaXMember) xProperty).getJavaType();
         } else {
             type = ((ParameterType) parameters.get(PARAMETER_TYPE)).getReturnedClass();
         }

diff --git a/...ava/com/vladmihalcea/hibernate/type/search/internal/PostgreSQLTSVectorTypeDescriptor.java b/...ava/com/vladmihalcea/hibernate/type/search/internal/PostgreSQLTSVectorTypeDescriptor.java
@@ -1,6 +1,5 @@
 package com.vladmihalcea.hibernate.type.search.internal;
 
-import com.vladmihalcea.hibernate.util.ReflectionUtils;
 import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.annotations.common.reflection.java.JavaXMember;
 import org.hibernate.type.descriptor.WrapperOptions;
@@ -24,7 +23,7 @@ public PostgreSQLTSVectorTypeDescriptor() {
     public void setParameterValues(Properties parameters) {
         final XProperty xProperty = (XProperty) parameters.get(DynamicParameterizedType.XPROPERTY);
         if (xProperty instanceof JavaXMember) {
-            type = ReflectionUtils.invokeGetter(xProperty, "javaType");
+            type = ((JavaXMember) xProperty).getJavaType();
         } else {
             type = ((ParameterType) parameters.get(PARAMETER_TYPE)).getReturnedClass();
         }