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

Author: dreab8

hibernate-reactive-core/src/main/java/org/hibernate/reactive/logging/impl/Log.java

@@ -159,11 +159,8 @@ public interface Log extends BasicLogger {
 	@Message(id = 47, value = "Generated identifier smaller or equal to 0: %1$d")
 	HibernateException generatedIdentifierSmallerOrEqualThanZero(Long id);
 
-	@Message(id = 48, value = "Could not determine Dialect from JDBC driver metadata (specify a connection URI with scheme 'postgresql:', 'mysql:', 'cockroachdb', or 'db2:')")
-	HibernateException couldNotDetermineDialectFromJdbcDriverMetadata();
-
-	@Message(id = 49, value = "Could not determine Dialect from connection URI: '%1$s' (specify a connection URI with scheme 'postgresql:', 'mysql:', 'cockroachdb', or 'db2:')")
-	HibernateException couldNotDetermineDialectFromConnectionURI(String url);
+	@Message(id = 49, value = "Could not determine Dialect from connection URI: '%1$s' (specify a connection URI with scheme 'postgresql:', 'postgres:', 'mariadb:', 'mysql:', 'db2:', 'cockroachdb:', 'sqlserver:' or 'oracle:' )")
+	IllegalArgumentException couldNotDetermineDialectFromConnectionURI(String url);
 
 	@Message(id = 50, value = "SelectGenerator is not supported in Hibernate Reactive")
 	HibernateException selectGeneratorIsNotSupportedInHibernateReactive();

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

@@ -90,12 +90,16 @@ public PoolOptions poolOptions() {
 
 	@Override
 	public SqlConnectOptions connectOptions(URI uri) {
-		String scheme = uri.getScheme();
-		String path = scheme.equals( "oracle" )
+		final String scheme = uri.getScheme();
+		if ( !isSchemeSupported( scheme ) ) {
+			throw LOG.couldNotDetermineDialectFromConnectionURI( uri.toString() );
+		}
+
+		final String path = scheme.equals( "oracle" )
 				? oraclePath( uri )
 				: uri.getPath();
 
-		String database = path.length() > 0
+		String database = path != null && !path.isEmpty()
 				? path.substring( 1 )
 				: "";
 
@@ -105,8 +109,8 @@ public SqlConnectOptions connectOptions(URI uri) {
 			database = database.substring( 0, database.indexOf( ':' ) );
 		}
 
-		String host = findHost( uri, scheme );
-		int port = findPort( uri, scheme );
+		final String host = findHost( uri, scheme );
+		final int port = findPort( uri, scheme );
 
 		//see if the credentials were specified via properties
 		String username = user;
@@ -385,4 +389,11 @@ private int defaultPort(String scheme) {
 		}
 	}
 
+	private boolean isSchemeSupported(String scheme) {
+		return switch ( scheme ) {
+			case "postgresql", "postgres", "mariadb", "mysql", "db2", "cockroachdb", "sqlserver", "oracle" -> true;
+			default -> false;
+		};
+	}
+
 }

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

@@ -29,6 +29,8 @@
 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.internal.util.config.ConfigurationHelper.getBooleanWrapper;
 import static org.hibernate.reactive.util.impl.CompletionStages.completedFuture;
 
 /**
@@ -84,7 +86,8 @@ protected JdbcEnvironmentImpl getJdbcEnvironmentUsingJdbcMetadata(
 			Integer explicitDatabaseMajorVersion,
 			Integer explicitDatabaseMinorVersion,
 			String explicitDatabaseVersion) {
-		try {
+		if ( getBooleanWrapper( ALLOW_METADATA_ON_BOOT, configurationValues, true ) ) {
+			// We query the database for the metadata to build the Dialect
 			final Dialect dialect = new DialectBuilder( configurationValues, registry )
 					.build(
 							dialectFactory,
@@ -97,7 +100,8 @@ protected JdbcEnvironmentImpl getJdbcEnvironmentUsingJdbcMetadata(
 					);
 			return new JdbcEnvironmentImpl( registry, dialect );
 		}
-		catch (RuntimeException e) {
+		else {
+			// We don't query the database but use default config values
 			return getJdbcEnvironmentWithDefaults( configurationValues, registry, dialectFactory );
 		}
 	}