fixes #2340 merged UtilityElf reflection instantiation improvements

brettwooldridge · brettwooldridge · commit 1a17112ddb06 · 2025-07-24T04:27:28.000+09:00
diff --git a/src/main/java/com/zaxxer/hikari/util/UtilityElf.java b/src/main/java/com/zaxxer/hikari/util/UtilityElf.java
@@ -19,9 +19,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.Constructor;
+import java.util.Arrays;
 import java.util.Locale;
 import java.util.concurrent.*;
 import java.util.regex.Pattern;
+import java.util.stream.IntStream;
 
 import static java.lang.Thread.currentThread;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -134,7 +137,18 @@ public static <T> T createInstance(final String className, final Class<T> clazz,
          for (int i = 0; i < totalArgs; i++) {
             argClasses[i] = args[i].getClass();
          }
-         var constructor = loaded.getConstructor(argClasses);
+
+         Constructor<?> constructor = Arrays.stream(loaded.getConstructors())
+            .filter(c -> {
+               if (c.getParameterCount() != totalArgs) return false;
+
+               Class<?>[] params = c.getParameterTypes();
+               return IntStream.range(0, totalArgs)
+                  .allMatch(i -> params[i].isAssignableFrom(argClasses[i]));
+            })
+            .findFirst()
+            .orElseThrow(() -> new RuntimeException("No suitable constructor found for class " + className + " with arguments " + Arrays.toString(args)));
+
          return clazz.cast(constructor.newInstance(args));
       }
       catch (Exception e) {
diff --git a/src/test/java/com/zaxxer/hikari/pool/TestValidation.java b/src/test/java/com/zaxxer/hikari/pool/TestValidation.java
@@ -106,7 +106,7 @@ public void validateBadDriver()
          fail();
       }
       catch (RuntimeException ise) {
-         assertTrue(ise.getMessage().startsWith("Failed to load driver class invalid "));
+         assertTrue(ise.getMessage().startsWith("Failed to load driver class invalid"));
       }
    }
 
diff --git a/src/test/java/com/zaxxer/hikari/util/UtilityElfTest.java b/src/test/java/com/zaxxer/hikari/util/UtilityElfTest.java
@@ -29,7 +29,7 @@ public void shouldReturnValidTransactionIsolationLevel()
       int expectedLevel = UtilityElf.getTransactionIsolation("TRANSACTION_SQL_SERVER_SNAPSHOT_ISOLATION_LEVEL");
 
       //Assert
-      assertEquals(expectedLevel, 4096);
+      assertEquals(4096, expectedLevel);
    }
 
    @Test(expected = IllegalArgumentException.class)
@@ -43,7 +43,7 @@ public void shouldThrowWhenInvalidTransactionNameGiven()
    public void shouldReturnTransationIsolationLevelFromInteger()
    {
       int expectedLevel = UtilityElf.getTransactionIsolation("4096");
-      assertEquals(expectedLevel, 4096);
+      assertEquals(4096, expectedLevel);
    }
 
    @Test(expected = IllegalArgumentException.class)
@@ -52,4 +52,28 @@ public void shouldThrowWhenInvalidTransactionIntegerGiven()
       //Act
       UtilityElf.getTransactionIsolation("9999");
    }
+
+   @Test
+   public void shouldCreateInstanceOfClassWithConstructorThatAcceptsSuperClassAndInterfaceAndClassOfArguments() {
+      //Act
+      UtilityElf.createInstance("com.zaxxer.hikari.util.UtilityElfTest$ClassZ",
+         Object.class,
+         new ClassB(),
+         new ClassC(),
+         new ClassD());
+   }
+
+   public static class ClassA {}
+
+   public static final class ClassB extends ClassA {}
+
+   public interface InterfaceC {}
+
+   public final static class ClassC implements InterfaceC {}
+
+   public final static class ClassD {}
+
+   public final static class ClassZ {
+      public ClassZ(ClassA _superClassA, InterfaceC _interfaceC, ClassD _classD) {}
+   }
 }

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public void validateBadDriver()`
`106`	`106`	`fail();`
`107`	`107`	`}`
`108`	`108`	`catch (RuntimeException ise) {`
`109`		`- assertTrue(ise.getMessage().startsWith("Failed to load driver class invalid "));`
	`109`	`+ assertTrue(ise.getMessage().startsWith("Failed to load driver class invalid"));`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`