CONJ-858 Properties parameter different than string not taken in account

``` Properties connProperties = new Properties(); connProperties.setProperty("useSSL", "true"); ``` is ok, but using the same as object will only be taken in account when value has a string value ``` Properties connProperties = new Properties(); connProperties.put("useSSL", true); ``` useSSL will not be enable, without any error.

Author: rusher

.travis.yml

@@ -1,7 +1,7 @@
-#dist: trusty
-sudo: false
+dist: xenial
 language: java
 services: docker
+os: linux
 addons:
  hosts:
  - mariadb.example.com
@@ -22,7 +22,7 @@ cache:
  directories:
  - $HOME/.m2
 
-matrix:
+jobs:
  allow_failures:
  - env: DB=build:10.6
  jdk: openjdk11

src/main/java/org/mariadb/jdbc/Configuration.java

@@ -438,19 +438,19 @@ private static void mapPropertiesToOption(Builder builder, Properties properties
  // loop on properties,
  // - check DefaultOption to check that property value correspond to type (and range)
  // - set values
- for (String key : properties.stringPropertyNames()) {
- String realKey = OptionAliases.OPTIONS_ALIASES.get(key);
- if (realKey == null) realKey = key;
- final String propertyValue = properties.getProperty(realKey);
+ for (final Object keyObj : properties.keySet()) {
+ String realKey = OptionAliases.OPTIONS_ALIASES.get(keyObj);
+ if (realKey == null) realKey = keyObj.toString();
+ final Object propertyValue = properties.get(realKey);
 
- if (propertyValue != null && !key.isEmpty()) {
+ if (propertyValue != null && realKey != null) {
  try {
  final Field field = Builder.class.getDeclaredField(realKey);
  field.setAccessible(true);
  if (field.getGenericType().equals(String.class)) {
  field.set(builder, propertyValue);
  } else if (field.getGenericType().equals(Boolean.class)) {
- switch (propertyValue.toLowerCase()) {
+ switch (propertyValue.toString().toLowerCase()) {
  case "":
  case "1":
  case "true":
@@ -466,22 +466,22 @@ private static void mapPropertiesToOption(Builder builder, Properties properties
  throw new IllegalArgumentException(
  String.format(
  "Optional parameter %s must be boolean (true/false or 0/1) was '%s'",
- key, propertyValue));
+  keyObj, propertyValue));
  }
  } else if (field.getGenericType().equals(Integer.class)) {
  try {
- final Integer value = Integer.parseInt(propertyValue);
+ final Integer value = Integer.parseInt(propertyValue.toString());
  field.set(builder, value);
  } catch (NumberFormatException n) {
  throw new IllegalArgumentException(
  String.format(
- "Optional parameter %s must be Integer, was '%s'", key, propertyValue));
+ "Optional parameter %s must be Integer, was '%s'", keyObj, propertyValue));
  }
  }
  } catch (NoSuchFieldException nfe) {
  // keep unknown option:
  // those might be used in authentication or identity plugin
- nonMappedOptions.put(key, properties.getProperty(key));
+ nonMappedOptions.put(keyObj, propertyValue);
  }
  }
  }

src/test/java/org/mariadb/jdbc/unit/util/ConfigurationTest.java

@@ -342,15 +342,33 @@ public void testJdbcParserSimpleIpv4Properties() throws SQLException {
  Properties prop = new Properties();
  prop.setProperty("user", "greg");
  prop.setProperty("password", "pass");
+ prop.setProperty("allowMultiQueries", "true");
 
  Configuration conf = org.mariadb.jdbc.Configuration.parse(url, prop);
  assertEquals("database", conf.database());
  assertEquals("greg", conf.user());
  assertEquals("pass", conf.password());
+ assertTrue(conf.allowMultiQueries());
  assertEquals(3, conf.addresses().size());
  assertEquals(HostAddress.from("master", 3306, true), conf.addresses().get(0));
  assertEquals(HostAddress.from("slave1", 3307, true), conf.addresses().get(1));
  assertEquals(HostAddress.from("slave2", 3308, true), conf.addresses().get(2));
+
+ prop = new Properties();
+ prop.put("user", "greg");
+ prop.put("password", "pass");
+ prop.put("allowMultiQueries", true);
+
+ conf = org.mariadb.jdbc.Configuration.parse(url, prop);
+ assertEquals("database", conf.database());
+ assertEquals("greg", conf.user());
+ assertEquals("pass", conf.password());
+ assertTrue(conf.allowMultiQueries());
+ assertEquals(3, conf.addresses().size());
+ assertEquals(HostAddress.from("master", 3306, true), conf.addresses().get(0));
+ assertEquals(HostAddress.from("slave1", 3307, true), conf.addresses().get(1));
+ assertEquals(HostAddress.from("slave2", 3308, true), conf.addresses().get(2));
+
  }
 
  @Test