Remove ReactiveDialectWrapper and relative classes

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/dialect/ReactiveDialectWrapper.java

@@ -26,9 +26,6 @@
 import org.hibernate.reactive.session.ReactiveConnectionSupplier;
 import org.hibernate.type.Type;
 
-
-import static org.hibernate.reactive.dialect.ReactiveDialectWrapper.instanceOf;
-
 public interface ReactiveAbstractReturningDelegate extends ReactiveInsertGeneratedIdentifierDelegate {
 
 	Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() );
@@ -62,23 +59,23 @@ private Object validateGeneratedIdentityId(Object generatedId) {
 		// Users should not rely on it, or they might have random, hard to debug failures.
 		Type identifierType = getPersister().getIdentifierType();
 		if ( ( identifierType.getReturnedClass().equals( Short.class ) || identifierType.getReturnedClass().equals( Integer.class ) )
-				&& instanceOf( getPersister().getFactory().getJdbcServices().getDialect(), CockroachDialect.class ) ) {
+				&& getPersister().getFactory().getJdbcServices().getDialect() instanceof CockroachDialect ) {
 			throw LOG.invalidIdentifierTypeForCockroachDB( identifierType.getReturnedClass(), getPersister().getEntityName() );
 		}
 		return generatedId;
 	}
 
 	private static String createInsert(PreparedStatementDetails insertStatementDetails, String identifierColumnName, Dialect dialect) {
 		final String sqlEnd = " returning " + identifierColumnName;
-		if ( instanceOf( dialect, MySQLDialect.class ) ) {
+		if ( dialect instanceof MySQLDialect ) {
 			// For some reasons ORM generates a query with an invalid syntax
 			String sql = insertStatementDetails.getSqlString();
 			int index = sql.lastIndexOf( sqlEnd );
 			return index > -1
 					? sql.substring( 0, index )
 					: sql;
 		}
-		if ( instanceOf( dialect, SQLServerDialect.class ) ) {
+		if ( dialect instanceof SQLServerDialect ) {
 			String sql = insertStatementDetails.getSqlString();
 			int index = sql.lastIndexOf( sqlEnd );
 			// FIXME: this is a hack for HHH-16365

hibernate-reactive-core/src/main/java/org/hibernate/reactive/dialect/identity/ReactiveIdentityColumnSupportAdapter.java

@@ -16,6 +16,7 @@
 import org.hibernate.engine.config.internal.ConfigurationServiceInitiator;
 import org.hibernate.engine.jdbc.batch.internal.BatchBuilderInitiator;
 import org.hibernate.engine.jdbc.cursor.internal.RefCursorSupportInitiator;
+import org.hibernate.engine.jdbc.dialect.internal.DialectFactoryInitiator;
 import org.hibernate.engine.jdbc.dialect.internal.DialectResolverInitiator;
 import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator;
 import org.hibernate.engine.jndi.internal.JndiServiceInitiator;
@@ -32,7 +33,6 @@
 import org.hibernate.reactive.provider.service.NoJdbcEnvironmentInitiator;
 import org.hibernate.reactive.provider.service.NoJdbcMultiTenantConnectionProviderInitiator;
 import org.hibernate.reactive.provider.service.NoJtaPlatformInitiator;
-import org.hibernate.reactive.provider.service.ReactiveDialectFactoryInitiator;
 import org.hibernate.reactive.provider.service.ReactiveMarkerServiceInitiator;
 import org.hibernate.reactive.provider.service.ReactivePersisterClassResolverInitiator;
 import org.hibernate.reactive.provider.service.ReactiveSchemaManagementToolInitiator;
@@ -113,8 +113,8 @@ private static List<StandardServiceInitiator<?>> buildInitialServiceInitiatorLis
 		// [standard] DialectResolver
 		serviceInitiators.add( DialectResolverInitiator.INSTANCE );
 
-		// Custom for Hibernate Reactive: DialectFactory ; wraps the standard Dialects with ReactiveDialectWrapper
-		serviceInitiators.add( ReactiveDialectFactoryInitiator.INSTANCE );
+		// [standard] DialectFactoryInitiator.INSTANCE
+		serviceInitiators.add( DialectFactoryInitiator.INSTANCE );
 
 		// Custom for Hibernate Reactive: MutationExecutorService
 		serviceInitiators.add( ReactiveMutationExecutorServiceInitiator.INSTANCE );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/id/insert/ReactiveAbstractReturningDelegate.java

@@ -23,7 +23,6 @@
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 import org.hibernate.reactive.adaptor.impl.PreparedStatementAdaptor;
-import org.hibernate.reactive.dialect.ReactiveDialectWrapper;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.type.AbstractSingleColumnStandardBasicType;
 import org.hibernate.type.BasicTypeRegistry;
@@ -92,10 +91,7 @@ private void registerReactiveChanges(TypeContributions typeContributions, Servic
 	}
 
 	private Dialect dialect(ServiceRegistry serviceRegistry) {
-		Dialect dialect = serviceRegistry.getService( JdbcEnvironment.class ).getDialect();
-		return dialect instanceof ReactiveDialectWrapper
-				? ( (ReactiveDialectWrapper) dialect ).getWrappedDialect()
-				: dialect;
+		return serviceRegistry.getService( JdbcEnvironment.class ).getDialect();
 	}
 
 	/**