GraalVM / Quarkus native build support - Use Thread.currentThread().g…

…etContextClassLoader() when calling Class.forName() vladmihalcea#177
fafa2008 · Jan 26, 2020 · 0937afc · 0937afc
1 parent aeb9db9
commit 0937afc
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 52 deletions.
diff --git a/hibernate-types-4/src/main/java/com/vladmihalcea/hibernate/type/util/ReflectionUtils.java b/hibernate-types-4/src/main/java/com/vladmihalcea/hibernate/type/util/ReflectionUtils.java
@@ -29,12 +29,8 @@ private ReflectionUtils() {
      * @return new Java {@link Object} of the provided type
      */
     public static <T> T newInstance(String className) {
-        try {
-            Class clazz = Class.forName(className);
-            return newInstance(clazz);
-        } catch (ClassNotFoundException e) {
-            throw handleException(e);
-        }
+        Class clazz = getClass(className);
+        return newInstance(clazz);
     }
 
     /**
@@ -430,7 +426,7 @@ public static <T> T invokeStaticMethod(Method method, Object... parameters) {
     @SuppressWarnings("unchecked")
     public static <T> Class<T> getClass(String className) {
         try {
-            return (Class<T>) Class.forName(className);
+            return (Class<T>) Class.forName(className, false, Thread.currentThread().getContextClassLoader());
         } catch (ClassNotFoundException e) {
             throw handleException(e);
         }
@@ -447,7 +443,7 @@ public static <T> Class<T> getClass(String className) {
     @SuppressWarnings("unchecked")
     public static <T> Class<T> getClassOrNull(String className) {
         try {
-            return (Class<T>) Class.forName(className);
+            return (Class<T>) getClass(className);
         } catch (Exception e) {
             return null;
         }

diff --git a/...rc/test/java/com/vladmihalcea/hibernate/type/util/providers/OracleDataSourceProvider.java b/...rc/test/java/com/vladmihalcea/hibernate/type/util/providers/OracleDataSourceProvider.java
@@ -31,11 +31,7 @@ public DataSource dataSource() {
 
     @Override
     public Class<? extends DataSource> dataSourceClassName() {
-        try {
-            return (Class<? extends DataSource>) Class.forName("oracle.jdbc.pool.OracleDataSource");
-        } catch (ClassNotFoundException e) {
-            throw new IllegalArgumentException(e);
-        }
+        return ReflectionUtils.getClass("oracle.jdbc.pool.OracleDataSource");
     }
 
     @Override

diff --git a/hibernate-types-43/src/main/java/com/vladmihalcea/hibernate/type/util/ReflectionUtils.java b/hibernate-types-43/src/main/java/com/vladmihalcea/hibernate/type/util/ReflectionUtils.java
@@ -29,12 +29,8 @@ private ReflectionUtils() {
      * @return new Java {@link Object} of the provided type
      */
     public static <T> T newInstance(String className) {
-        try {
-            Class clazz = Class.forName(className);
-            return newInstance(clazz);
-        } catch (ClassNotFoundException e) {
-            throw handleException(e);
-        }
+        Class clazz = getClass(className);
+        return newInstance(clazz);
     }
 
     /**
@@ -430,7 +426,7 @@ public static <T> T invokeStaticMethod(Method method, Object... parameters) {
     @SuppressWarnings("unchecked")
     public static <T> Class<T> getClass(String className) {
         try {
-            return (Class<T>) Class.forName(className);
+            return (Class<T>) Class.forName(className, false, Thread.currentThread().getContextClassLoader());
         } catch (ClassNotFoundException e) {
             throw handleException(e);
         }
@@ -447,7 +443,7 @@ public static <T> Class<T> getClass(String className) {
     @SuppressWarnings("unchecked")
     public static <T> Class<T> getClassOrNull(String className) {
         try {
-            return (Class<T>) Class.forName(className);
+            return (Class<T>) getClass(className);
         } catch (Exception e) {
             return null;
         }

diff --git a/...rc/test/java/com/vladmihalcea/hibernate/type/util/providers/OracleDataSourceProvider.java b/...rc/test/java/com/vladmihalcea/hibernate/type/util/providers/OracleDataSourceProvider.java
@@ -31,11 +31,7 @@ public DataSource dataSource() {
 
     @Override
     public Class<? extends DataSource> dataSourceClassName() {
-        try {
-            return (Class<? extends DataSource>) Class.forName("oracle.jdbc.pool.OracleDataSource");
-        } catch (ClassNotFoundException e) {
-            throw new IllegalArgumentException(e);
-        }
+        return ReflectionUtils.getClass("oracle.jdbc.pool.OracleDataSource");
     }
 
     @Override

diff --git a/hibernate-types-5/src/main/java/com/vladmihalcea/hibernate/type/util/ReflectionUtils.java b/hibernate-types-5/src/main/java/com/vladmihalcea/hibernate/type/util/ReflectionUtils.java
@@ -29,12 +29,8 @@ private ReflectionUtils() {
      * @return new Java {@link Object} of the provided type
      */
     public static <T> T newInstance(String className) {
-        try {
-            Class clazz = Class.forName(className);
-            return newInstance(clazz);
-        } catch (ClassNotFoundException e) {
-            throw handleException(e);
-        }
+        Class clazz = getClass(className);
+        return newInstance(clazz);
     }
 
     /**
@@ -430,7 +426,7 @@ public static <T> T invokeStaticMethod(Method method, Object... parameters) {
     @SuppressWarnings("unchecked")
     public static <T> Class<T> getClass(String className) {
         try {
-            return (Class<T>) Class.forName(className);
+            return (Class<T>) Class.forName(className, false, Thread.currentThread().getContextClassLoader());
         } catch (ClassNotFoundException e) {
             throw handleException(e);
         }
@@ -447,7 +443,7 @@ public static <T> Class<T> getClass(String className) {
     @SuppressWarnings("unchecked")
     public static <T> Class<T> getClassOrNull(String className) {
         try {
-            return (Class<T>) Class.forName(className);
+            return (Class<T>) getClass(className);
         } catch (Exception e) {
             return null;
         }

diff --git a/...rc/test/java/com/vladmihalcea/hibernate/type/util/providers/OracleDataSourceProvider.java b/...rc/test/java/com/vladmihalcea/hibernate/type/util/providers/OracleDataSourceProvider.java
@@ -35,11 +35,7 @@ public DataSource dataSource() {
 
     @Override
     public Class<? extends DataSource> dataSourceClassName() {
-        try {
-            return (Class<? extends DataSource>) Class.forName("oracle.jdbc.pool.OracleDataSource");
-        } catch (ClassNotFoundException e) {
-            throw new IllegalArgumentException(e);
-        }
+        return ReflectionUtils.getClass("oracle.jdbc.pool.OracleDataSource");
     }
 
     @Override

diff --git a/hibernate-types-52/src/main/java/com/vladmihalcea/hibernate/type/util/ReflectionUtils.java b/hibernate-types-52/src/main/java/com/vladmihalcea/hibernate/type/util/ReflectionUtils.java
@@ -29,12 +29,8 @@ private ReflectionUtils() {
      * @return new Java {@link Object} of the provided type
      */
     public static <T> T newInstance(String className) {
-        try {
-            Class clazz = Class.forName(className);
-            return newInstance(clazz);
-        } catch (ClassNotFoundException e) {
-            throw handleException(e);
-        }
+        Class clazz = getClass(className);
+        return newInstance(clazz);
     }
 
     /**
@@ -456,7 +452,7 @@ public static <T> T invokeStaticMethod(Method method, Object... parameters) {
     @SuppressWarnings("unchecked")
     public static <T> Class<T> getClass(String className) {
         try {
-            return (Class<T>) Class.forName(className);
+            return (Class<T>) Class.forName(className, false, Thread.currentThread().getContextClassLoader());
         } catch (ClassNotFoundException e) {
             throw handleException(e);
         }
@@ -473,7 +469,7 @@ public static <T> Class<T> getClass(String className) {
     @SuppressWarnings("unchecked")
     public static <T> Class<T> getClassOrNull(String className) {
         try {
-            return (Class<T>) Class.forName(className);
+            return (Class<T>) getClass(className);
         } catch (Exception e) {
             return null;
         }

diff --git a/...rc/test/java/com/vladmihalcea/hibernate/type/util/providers/OracleDataSourceProvider.java b/...rc/test/java/com/vladmihalcea/hibernate/type/util/providers/OracleDataSourceProvider.java
@@ -35,11 +35,7 @@ public DataSource dataSource() {
 
     @Override
     public Class<? extends DataSource> dataSourceClassName() {
-        try {
-            return (Class<? extends DataSource>) Class.forName("oracle.jdbc.pool.OracleDataSource");
-        } catch (ClassNotFoundException e) {
-            throw new IllegalArgumentException(e);
-        }
+        return ReflectionUtils.getClass("oracle.jdbc.pool.OracleDataSource");
     }
 
     @Override