add support for char[] in PropertyElf (#2059)

fix #2058
brettwooldridge · Sep 15, 2023 · 53459ab · 53459ab
1 parent 61ac830
commit 53459ab
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/src/main/java/com/zaxxer/hikari/util/PropertyElf.java b/src/main/java/com/zaxxer/hikari/util/PropertyElf.java
@@ -141,6 +141,9 @@ else if (paramClass == short.class) {
          else if (paramClass == boolean.class || paramClass == Boolean.class) {
             writeMethod.invoke(target, Boolean.parseBoolean(propValue.toString()));
          }
+         else if (paramClass.isArray() && char.class.isAssignableFrom(paramClass.getComponentType())) {
+            writeMethod.invoke(target, propValue.toString().toCharArray());
+         }
          else if (paramClass == String.class) {
             writeMethod.invoke(target, propValue.toString());
          }

diff --git a/src/test/java/com/zaxxer/hikari/mocks/TestObject.java b/src/test/java/com/zaxxer/hikari/mocks/TestObject.java
@@ -5,6 +5,7 @@ public class TestObject
    private TestObject testObject;
    private String string;
    private short shortRaw;
+   private char[] charArray;
 
    public void setTestObject(TestObject testObject)
    {
@@ -33,4 +34,14 @@ public short getShortRaw() {
    public void setShortRaw(short shortRaw) {
       this.shortRaw = shortRaw;
    }
+
+   public void setCharArray(char[] charArray)
+   {
+      this.charArray = charArray;
+   }
+
+   public char[] getCharArray()
+   {
+      return charArray;
+   }
 }
diff --git a/src/test/java/com/zaxxer/hikari/util/PropertyElfTest.java b/src/test/java/com/zaxxer/hikari/util/PropertyElfTest.java
@@ -5,6 +5,7 @@
 
 import java.util.Properties;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.fail;
@@ -18,10 +19,12 @@ public void setTargetFromProperties() throws Exception
       properties.setProperty("string", "aString");
       properties.setProperty("testObject", "com.zaxxer.hikari.mocks.TestObject");
       properties.setProperty("shortRaw", "1");
+      properties.setProperty("charArray", "aCharArray");
       TestObject testObject = new TestObject();
       PropertyElf.setTargetFromProperties(testObject, properties);
       assertEquals("aString", testObject.getString());
       assertEquals((short) 1, testObject.getShortRaw());
+      assertArrayEquals("aCharArray".toCharArray(), testObject.getCharArray());
       assertEquals(com.zaxxer.hikari.mocks.TestObject.class, testObject.getTestObject().getClass());
       assertNotSame(testObject, testObject.getTestObject());
    }