[misc] connection parser avoiding REGEX

Author: diego Dupin

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

@@ -49,9 +49,6 @@
  */
 public class Configuration {
 
- private static final Pattern URL_PARAMETER =
- Pattern.compile("(/([^?]*))?(\\?(.+))*", Pattern.DOTALL);
-
  // standard options
  private String user = null;
  private String password = null;
@@ -533,25 +530,31 @@ private static Configuration parseInternal(String url, Properties properties)
  }
 
  if (additionalParameters != null) {
- //noinspection Annotator
- Matcher matcher = URL_PARAMETER.matcher(additionalParameters);
- matcher.find();
- String database = matcher.group(2);
- if (database != null && !database.isEmpty()) {
- builder.database(database);
- }
- String urlParameters = matcher.group(4);
- if (urlParameters != null && !urlParameters.isEmpty()) {
- String[] parameters = urlParameters.split("&");
- for (String parameter : parameters) {
- int pos = parameter.indexOf('=');
- if (pos == -1) {
- properties.setProperty(parameter, "");
- } else {
- properties.setProperty(parameter.substring(0, pos), parameter.substring(pos + 1));
+ int optIndex = additionalParameters.indexOf("?");
+ String database;
+ if (optIndex < 0) {
+ database = (additionalParameters.length() > 1) ? additionalParameters.substring(1) : null;
+ } else {
+ if (optIndex == 0) {
+ database = null;
+ } else {
+ database = additionalParameters.substring(1, optIndex);
+ if (database.isEmpty()) database = null;
+ }
+ String urlParameters = additionalParameters.substring(optIndex + 1);
+ if (urlParameters != null && !urlParameters.isEmpty()) {
+ String[] parameters = urlParameters.split("&");
+ for (String parameter : parameters) {
+ int pos = parameter.indexOf('=');
+ if (pos == -1) {
+ properties.setProperty(parameter, "");
+ } else {
+ properties.setProperty(parameter.substring(0, pos), parameter.substring(pos + 1));
+ }
  }
  }
  }
+ builder.database(database);
  } else {
  builder.database(null);
  }

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

@@ -401,6 +401,19 @@ public void testJdbcParserWithoutDatabaseWithProperties() throws SQLException {
  assertEquals(HostAddress.from("slave2", 3308, true), conf.addresses().get(2));
  }
 
+ @Test
+ public void testJdbcParserWithoutDatabase2WithProperties() throws SQLException {
+ String url = "jdbc:mariadb://master:3306,slave1:3307,slave2:3308/?autoReconnect=true";
+ Configuration conf = org.mariadb.jdbc.Configuration.parse(url);
+ assertNull(conf.database());
+ assertNull(conf.user());
+ assertNull(conf.password());
+ 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
  public void testJdbcParserSimpleIpv4Properties() throws SQLException {
  String url = "jdbc:mariadb://master:3306,slave1:3307,slave2:3308/database?autoReconnect=true";