[misc] Configuration initialUrl/toString using simplified host notation when possible

Author: diego Dupin

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

@@ -1032,19 +1032,25 @@ protected static String buildUrl(Configuration conf) {
  sb.append(conf.haMode.toString().toLowerCase(Locale.ROOT)).append(":");
  }
  sb.append("//");
-
  for (int i = 0; i < conf.addresses.size(); i++) {
  HostAddress hostAddress = conf.addresses.get(i);
  if (i > 0) {
  sb.append(",");
  }
- sb.append("address=(host=")
- .append(hostAddress.host)
- .append(")")
- .append("(port=")
- .append(hostAddress.port)
- .append(")");
- sb.append("(type=").append(hostAddress.primary ? "primary" : "replica").append(")");
+ if ((conf.haMode == HaMode.NONE && hostAddress.primary)
+ || (conf.haMode == HaMode.REPLICATION
+ && ((i == 0 && hostAddress.primary) || (i != 0 && !hostAddress.primary)))) {
+ sb.append(hostAddress.host);
+ if (hostAddress.port != 3306) sb.append(":").append(hostAddress.port);
+ } else {
+ sb.append("address=(host=")
+ .append(hostAddress.host)
+ .append(")")
+ .append("(port=")
+ .append(hostAddress.port)
+ .append(")");
+ sb.append("(type=").append(hostAddress.primary ? "primary" : "replica").append(")");
+ }
  }
 
  sb.append("/");

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

@@ -91,12 +91,8 @@ public void testUrl() throws SQLException {
  .addHost("local", 3306, true)
  .haMode(HaMode.REPLICATION)
  .build();
- assertEquals(
- "jdbc:mariadb:replication://address=(host=local)(port=3306)(type=primary)/DB",
- conf.initialUrl());
- assertEquals(
- "jdbc:mariadb:replication://address=(host=local)(port=3306)(type=primary)/DB",
- conf.toString());
+ assertEquals("jdbc:mariadb:replication://local/DB", conf.initialUrl());
+ assertEquals("jdbc:mariadb:replication://local/DB", conf.toString());
  assertEquals(
  Configuration.parse(
  "jdbc:mariadb:replication://address=(host=local)(port=3306)(type=primary)/DB"),
@@ -110,9 +106,7 @@ public void testUrl() throws SQLException {
  .haMode(HaMode.REPLICATION)
  .build();
 
- assertEquals(
- "jdbc:mariadb:replication://address=(host=local)(port=3306)(type=primary),address=(host=host2)(port=3307)(type=replica)/DB",
- conf.initialUrl());
+ assertEquals("jdbc:mariadb:replication://local,host2:3307/DB", conf.initialUrl());
 
  conf =
  new Configuration.Builder()
@@ -121,9 +115,7 @@ public void testUrl() throws SQLException {
  .haMode(HaMode.REPLICATION)
  .socketTimeout(50)
  .build();
- assertEquals(
- "jdbc:mariadb:replication://address=(host=local)(port=3306)(type=primary)/DB?socketTimeout=50",
- conf.initialUrl());
+ assertEquals("jdbc:mariadb:replication://local/DB?socketTimeout=50", conf.initialUrl());
 
  conf =
  new Configuration.Builder()
@@ -135,7 +127,7 @@ public void testUrl() throws SQLException {
  .socketTimeout(50)
  .build();
  assertEquals(
- "jdbc:mariadb:replication://address=(host=local)(port=3306)(type=primary),address=(host=local)(port=3307)(type=replica),address=(host=local)(port=3308)(type=replica)/DB?socketTimeout=50",
+ "jdbc:mariadb:replication://local,local:3307,local:3308/DB?socketTimeout=50",
  conf.initialUrl());
 
  conf =
@@ -158,9 +150,7 @@ public void testUrl() throws SQLException {
  .haMode(HaMode.REPLICATION)
  .autocommit(false)
  .build();
- assertEquals(
- "jdbc:mariadb:replication://address=(host=local)(port=3306)(type=primary)/DB?autocommit=false",
- conf.initialUrl());
+ assertEquals("jdbc:mariadb:replication://local/DB?autocommit=false", conf.initialUrl());
  }
 
  @Test
@@ -360,26 +350,23 @@ public void testOptionParseIntegerNotPossible() {
  public void testJdbcParserSimpleIpv4basic() throws SQLException {
  String url = "jdbc:mariadb://master:3306,slave1:3307,slave2:3308/database";
  Configuration conf = Configuration.parse(url);
- assertEquals(
- "jdbc:mariadb://address=(host=master)(port=3306)(type=primary),address=(host=slave1)(port=3307)(type=primary),address=(host=slave2)(port=3308)(type=primary)/database",
- conf.initialUrl());
+ assertEquals("jdbc:mariadb://master,slave1:3307,slave2:3308/database", conf.initialUrl());
  url =
  "jdbc:mariadb://address=(host=master)(port=3306)(type=primary),address=(host=slave1)(port=3307)(type=replica),address=(host=slave2)(port=3308)(type=replica)/database";
  conf = Configuration.parse(url);
  assertEquals(
- "jdbc:mariadb://address=(host=master)(port=3306)(type=primary),address=(host=slave1)(port=3307)(type=replica),address=(host=slave2)(port=3308)(type=replica)/database",
+ "jdbc:mariadb://master,address=(host=slave1)(port=3307)(type=replica),address=(host=slave2)(port=3308)(type=replica)/database",
  conf.initialUrl());
  url =
  "jdbc:mariadb://address=(host=master)(port=3306)(type=master),address=(host=slave1)(port=3307)(type=replica),address=(host=slave2)(port=3308)(type=replica)/database";
  conf = Configuration.parse(url);
  assertEquals(
- "jdbc:mariadb://address=(host=master)(port=3306)(type=primary),address=(host=slave1)(port=3307)(type=replica),address=(host=slave2)(port=3308)(type=replica)/database",
+ "jdbc:mariadb://master,address=(host=slave1)(port=3307)(type=replica),address=(host=slave2)(port=3308)(type=replica)/database",
  conf.initialUrl());
  url = "jdbc:mariadb:replication://master:3306,slave1:3307,slave2:3308/database";
  conf = Configuration.parse(url);
  assertEquals(
- "jdbc:mariadb:replication://address=(host=master)(port=3306)(type=primary),address=(host=slave1)(port=3307)(type=replica),address=(host=slave2)(port=3308)(type=replica)/database",
- conf.initialUrl());
+ "jdbc:mariadb:replication://master,slave1:3307,slave2:3308/database", conf.initialUrl());
  }
 
  @Test
@@ -814,7 +801,7 @@ public void builder() throws SQLException {
  .allowPublicKeyRetrieval(true)
  .build();
  assertEquals(
- "jdbc:mariadb://address=(host=host1)(port=3305)(type=primary),address=(host=host2)(port=3307)(type=replica)/db?user=me&password=pwd&timezone=UTC&autocommit=false&defaultFetchSize=10&maxQuerySizeToLog=100&geometryDefaultType=default&restrictedAuth=mysql_native_password,client_ed25519&socketFactory=someSocketFactory&connectTimeout=22&pipe=pipeName&localSocket=localSocket&tcpKeepAlive=true&tcpKeepIdle=10&tcpKeepCount=50&tcpKeepInterval=50&tcpAbortiveClose=true&localSocketAddress=localSocketAddress&socketTimeout=1000&useReadAheadInput=false&tlsSocketType=TLStype&sslMode=TRUST&serverSslCert=mycertPath&keyStore=/tmp&keyStorePassword=MyPWD&keyStoreType=JKS&enabledSslCipherSuites=myCipher,cipher2&enabledSslProtocolSuites=TLSv1.2&allowMultiQueries=true&allowLocalInfile=true&useCompression=true&useAffectedRows=true&useBulkStmts=false&cachePrepStmts=false&prepStmtCacheSize=2&useServerPrepStmts=true&credentialType=ENV&sessionVariables=blabla&connectionAttributes=bla=bla&servicePrincipalName=SPN&blankTableNameMeta=true&tinyInt1isBit=false&yearIsDateType=false&dumpQueriesOnException=true&includeInnodbStatusInDeadlockExceptions=true&includeThreadDumpInDeadlockExceptions=true&retriesAllDown=10&galeraAllowedState=A,B&transactionReplay=true&pool=true&poolName=myPool&maxPoolSize=16&minPoolSize=12&maxIdleTime=25000&registerJmxPool=false&poolValidMinDelay=260&useResetConnection=true&serverRsaPublicKeyFile=RSAPath&allowPublicKeyRetrieval=true",
+ "jdbc:mariadb://host1:3305,address=(host=host2)(port=3307)(type=replica)/db?user=me&password=pwd&timezone=UTC&autocommit=false&defaultFetchSize=10&maxQuerySizeToLog=100&geometryDefaultType=default&restrictedAuth=mysql_native_password,client_ed25519&socketFactory=someSocketFactory&connectTimeout=22&pipe=pipeName&localSocket=localSocket&tcpKeepAlive=true&tcpKeepIdle=10&tcpKeepCount=50&tcpKeepInterval=50&tcpAbortiveClose=true&localSocketAddress=localSocketAddress&socketTimeout=1000&useReadAheadInput=false&tlsSocketType=TLStype&sslMode=TRUST&serverSslCert=mycertPath&keyStore=/tmp&keyStorePassword=MyPWD&keyStoreType=JKS&enabledSslCipherSuites=myCipher,cipher2&enabledSslProtocolSuites=TLSv1.2&allowMultiQueries=true&allowLocalInfile=true&useCompression=true&useAffectedRows=true&useBulkStmts=false&cachePrepStmts=false&prepStmtCacheSize=2&useServerPrepStmts=true&credentialType=ENV&sessionVariables=blabla&connectionAttributes=bla=bla&servicePrincipalName=SPN&blankTableNameMeta=true&tinyInt1isBit=false&yearIsDateType=false&dumpQueriesOnException=true&includeInnodbStatusInDeadlockExceptions=true&includeThreadDumpInDeadlockExceptions=true&retriesAllDown=10&galeraAllowedState=A,B&transactionReplay=true&pool=true&poolName=myPool&maxPoolSize=16&minPoolSize=12&maxIdleTime=25000&registerJmxPool=false&poolValidMinDelay=260&useResetConnection=true&serverRsaPublicKeyFile=RSAPath&allowPublicKeyRetrieval=true",
  conf.toString());
  }