Update DriverDataSource to not convert all provided property values to String.

src/main/java/com/zaxxer/hikari/HikariConfig.java

@@ -1105,6 +1105,9 @@ private void logConfiguration()
             if ("dataSourceProperties".equals(prop)) {
                var dsProps = PropertyElf.copyProperties(dataSourceProperties);
                dsProps.setProperty("password", "<masked>");
+               if (dsProps.containsKey("privateKey")) {
+                  dsProps.setProperty("privateKey", "<masked>");
+               }
                value = dsProps;
             }
 

src/main/java/com/zaxxer/hikari/HikariJNDIFactory.java

@@ -45,7 +45,7 @@ synchronized public Object getObjectInstance(Object obj, Name name, Context name
             var element = enumeration.nextElement();
             var type = element.getType();
             if (type.startsWith("dataSource.") || hikariPropSet.contains(type)) {
-               properties.setProperty(type, element.getContent().toString());
+               properties.put(type, element.getContent());
             }
          }
          return createDataSource(properties, nameCtx);

src/main/java/com/zaxxer/hikari/util/DriverDataSource.java

@@ -46,7 +46,7 @@ public DriverDataSource(String jdbcUrl, String driverClassName, Properties prope
       this.driverProperties = new Properties();
 
       for (var entry : properties.entrySet()) {
-         driverProperties.setProperty(entry.getKey().toString(), entry.getValue().toString());
+         driverProperties.put(entry.getKey().toString(), entry.getValue());
       }
 
       if (username != null) {

src/main/java/com/zaxxer/hikari/util/PropertyElf.java

@@ -105,7 +105,7 @@ public static Object getProperty(final String propName, final Object target)
    public static Properties copyProperties(final Properties props)
    {
       var copy = new Properties();
-      props.forEach((key, value) -> copy.setProperty(key.toString(), value.toString()));
+      props.forEach((key, value) -> copy.put(key.toString(), value));
       return copy;
    }
 

src/test/java/com/zaxxer/hikari/pool/TestJNDI.java

@@ -44,11 +44,13 @@ public void testJndiLookup1() throws Exception
       ref.add(new BogusRef("maxLifetime", "30000"));
       ref.add(new BogusRef("maximumPoolSize", "10"));
       ref.add(new BogusRef("dataSource.loginTimeout", "10"));
+      ref.add(new BogusRef("dataSource.nonStringObj", Integer.valueOf(10)));
       Context nameCtx = new BogusContext();
 
       try (HikariDataSource ds = (HikariDataSource) jndi.getObjectInstance(ref, null, nameCtx, null)) {
          assertNotNull(ds);
          assertEquals("foo", getUnsealedConfig(ds).getUsername());
+         assertEquals(ds.getDataSourceProperties().get("nonStringObj"), Integer.valueOf(10));
       }
    }
 
@@ -149,8 +151,8 @@ private class BogusRef extends RefAddr
    {
       private static final long serialVersionUID = 1L;
 
-      private String content;
-      BogusRef(String type, String content)
+      private Object content;
+      BogusRef(String type, Object content)
       {
          super(type);
          this.content = content;

src/test/java/com/zaxxer/hikari/util/PropertyElfTest.java

@@ -41,4 +41,26 @@ public void setTargetFromPropertiesNotAClass() throws Exception
          assertEquals("argument type mismatch", e.getCause().getMessage());
       }
    }
+
+   @Test
+   public void copyPropertiesPropValueIsString() {
+      Properties propertiesOrig = new Properties();
+      String stringPropName = "stringProp";
+      String stringPropValue = "aString";
+      propertiesOrig.setProperty(stringPropName, stringPropValue);
+
+      Properties propertiesCopy = PropertyElf.copyProperties(propertiesOrig);
+      assertEquals(stringPropValue, propertiesCopy.getProperty(stringPropName));
+   }
+
+   @Test
+   public void copyPropertiesPropValueIsNonStringObject() {
+      Properties propertiesOrig = new Properties();
+      String propName = "nonStringProp";
+      Integer propValue = 10;
+      propertiesOrig.put(propName, propValue);
+
+      Properties propertiesCopy = PropertyElf.copyProperties(propertiesOrig);
+      assertEquals(propValue, propertiesCopy.get(propName));
+   }
 }