Handle short in PropertyElf (brettwooldridge#1581)

guoamocker · Jan 11, 2021 · 29eb681 · 29eb681
1 parent a228b6d
commit 29eb681
Show file tree

Hide file tree

Showing 3 changed files with 14 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
@@ -143,6 +143,9 @@ private static void setProperty(final Object target, final String propName, fina
          else if (paramClass == long.class) {
             writeMethod.invoke(target, Long.parseLong(propValue.toString()));
          }
+         else if (paramClass == short.class) {
+            writeMethod.invoke(target, Short.parseShort(propValue.toString()));
+         }
          else if (paramClass == boolean.class || paramClass == Boolean.class) {
             writeMethod.invoke(target, Boolean.parseBoolean(propValue.toString()));
          }

diff --git a/src/test/java/com/zaxxer/hikari/mocks/TestObject.java b/src/test/java/com/zaxxer/hikari/mocks/TestObject.java
@@ -4,6 +4,7 @@ public class TestObject
 {
    private TestObject testObject;
    private String string;
+   private short shortRaw;
 
    public void setTestObject(TestObject testObject)
    {
@@ -24,4 +25,12 @@ public String getString()
    {
       return string;
    }
+
+   public short getShortRaw() {
+      return shortRaw;
+   }
+
+   public void setShortRaw(short shortRaw) {
+      this.shortRaw = shortRaw;
+   }
 }
diff --git a/src/test/java/com/zaxxer/hikari/util/PropertyElfTest.java b/src/test/java/com/zaxxer/hikari/util/PropertyElfTest.java
@@ -18,9 +18,11 @@ public void setTargetFromProperties() throws Exception
       Properties properties = new Properties();
       properties.setProperty("string", "aString");
       properties.setProperty("testObject", "com.zaxxer.hikari.mocks.TestObject");
+      properties.setProperty("shortRaw", "1");
       TestObject testObject = new TestObject();
       PropertyElf.setTargetFromProperties(testObject, properties);
       assertEquals("aString", testObject.getString());
+      assertEquals((short) 1, testObject.getShortRaw());
       assertEquals(com.zaxxer.hikari.mocks.TestObject.class, testObject.getTestObject().getClass());
       assertNotSame(testObject, testObject.getTestObject());
    }