[#2478] Terrible error reporting when JDBC scheme is not recognized

Author: dreab8

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

@@ -11,6 +11,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import org.hibernate.internal.util.StringHelper;
 import org.hibernate.reactive.logging.impl.Log;
 import org.hibernate.reactive.logging.impl.LoggerFactory;
 import org.hibernate.reactive.provider.Settings;
@@ -95,7 +96,7 @@ public SqlConnectOptions connectOptions(URI uri) {
 				? oraclePath( uri )
 				: uri.getPath();
 
-		String database = path.length() > 0
+		String database = path != null && !path.isEmpty()
 				? path.substring( 1 )
 				: "";
 
@@ -105,9 +106,6 @@ public SqlConnectOptions connectOptions(URI uri) {
 			database = database.substring( 0, database.indexOf( ':' ) );
 		}
 
-		String host = findHost( uri, scheme );
-		int port = findPort( uri, scheme );
-
 		//see if the credentials were specified via properties
 		String username = user;
 		String password = pass;
@@ -183,6 +181,13 @@ else if ( param.startsWith( "database=" ) ) {
 			}
 		}
 
+		if ( StringHelper.isEmpty( database  ) ) {
+			throw LOG.couldNotDetermineDialectFromConnectionURI( uri.toString() );
+		}
+
+		String host = findHost( uri, scheme );
+		int port = findPort( uri, scheme );
+
 		if ( username == null ) {
 			throw LOG.databaseUsernameNotSpecified();
 		}

hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcEnvironmentInitiator.java

@@ -29,6 +29,7 @@
 import static java.lang.Integer.parseInt;
 import static java.util.Objects.requireNonNullElse;
 import static java.util.function.Function.identity;
+import static org.hibernate.cfg.JdbcSettings.ALLOW_METADATA_ON_BOOT;
 import static org.hibernate.reactive.util.impl.CompletionStages.completedFuture;
 
 /**
@@ -84,7 +85,7 @@ protected JdbcEnvironmentImpl getJdbcEnvironmentUsingJdbcMetadata(
 			Integer explicitDatabaseMajorVersion,
 			Integer explicitDatabaseMinorVersion,
 			String explicitDatabaseVersion) {
-		try {
+		if ( configurationValues.containsKey( ALLOW_METADATA_ON_BOOT ) ) {
 			final Dialect dialect = new DialectBuilder( configurationValues, registry )
 					.build(
 							dialectFactory,
@@ -97,7 +98,7 @@ protected JdbcEnvironmentImpl getJdbcEnvironmentUsingJdbcMetadata(
 					);
 			return new JdbcEnvironmentImpl( registry, dialect );
 		}
-		catch (RuntimeException e) {
+		else {
 			return getJdbcEnvironmentWithDefaults( configurationValues, registry, dialectFactory );
 		}
 	}