correctly default the port number if missing from JDBC URL

Author: gavinking

example/src/main/resources/META-INF/persistence.xml

@@ -12,11 +12,11 @@
 
             <!-- PostgreSQL -->
             <property name="javax.persistence.jdbc.url"
-                      value="jdbc:postgresql://localhost:5432/hreact"/>
+                      value="jdbc:postgresql://localhost/hreact"/>
 
             <!-- MySQL -->
             <!--property name="javax.persistence.jdbc.url"
-                      value="jdbc:mysql://localhost:3306/hreact"/-->
+                      value="jdbc:mysql://localhost/hreact"/-->
 
             <!-- Credentials -->
             <property name="javax.persistence.jdbc.user"

hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/SqlClientPool.java

@@ -110,8 +110,10 @@ private PoolOptions poolOptions(Map configurationValues) {
 
 	private SqlConnectOptions sqlConnectOptions(URI uri) {
 
+		String scheme = uri.getScheme();
+
 		String database = uri.getPath().substring( 1 );
-		if (uri.getScheme().equals("db2") && database.indexOf( ':' ) > 0) {
+		if ( scheme.equals("db2") && database.indexOf( ':' ) > 0 ) {
 			database = database.substring( 0, database.indexOf( ':' ) );
 		}
 
@@ -121,7 +123,7 @@ private SqlConnectOptions sqlConnectOptions(URI uri) {
 		if (username==null || password==null) {
 			String[] params = {};
 			// DB2 URLs are a bit odd and have the format: jdbc:db2://<HOST>:<PORT>/<DB>:key1=value1;key2=value2;
-			if (uri.getScheme().equals("db2")) {
+			if ( scheme.equals("db2") ) {
 				int queryIndex = uri.getPath().indexOf(':') + 1;
 				if (queryIndex > 0) {
 					params = uri.getPath().substring(queryIndex).split(";");
@@ -142,9 +144,18 @@ private SqlConnectOptions sqlConnectOptions(URI uri) {
 			}
 		}
 
+		int port = uri.getPort();
+		if (port==-1) {
+			switch (scheme) {
+				case "postgresql": port = 5432; break;
+				case "mysql": port = 3306; break;
+				case "db2": port = 50000; break;
+			}
+		}
+
 		SqlConnectOptions connectOptions = new SqlConnectOptions()
 				.setHost( uri.getHost() )
-				.setPort( uri.getPort() )
+				.setPort( port )
 				.setDatabase( database )
 				.setUser( username );
 		if (password != null) {