Leverage HHH-16226 to avoid needing to customize SqlAstTranslatorFactory factories

Author: Sanne

hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/impl/ReactiveServiceInitiators.java

@@ -36,6 +36,7 @@
 import org.hibernate.reactive.provider.service.ReactivePersisterClassResolverInitiator;
 import org.hibernate.reactive.provider.service.ReactiveSchemaManagementToolInitiator;
 import org.hibernate.reactive.provider.service.ReactiveSessionFactoryBuilderInitiator;
+import org.hibernate.reactive.provider.service.ReactiveValuesMappingProducerProviderInitiator;
 import org.hibernate.reactive.vertx.impl.VertxInstanceInitiator;
 import org.hibernate.resource.beans.spi.ManagedBeanRegistryInitiator;
 import org.hibernate.resource.transaction.internal.TransactionCoordinatorBuilderInitiator;
@@ -123,6 +124,8 @@ private static List<StandardServiceInitiator<?>> buildInitialServiceInitiatorLis
 		serviceInitiators.add( ManagedBeanRegistryInitiator.INSTANCE );
 		serviceInitiators.add( EntityCopyObserverFactoryInitiator.INSTANCE );
 
+		serviceInitiators.add( ReactiveValuesMappingProducerProviderInitiator.INSTANCE );
+
 		serviceInitiators.trimToSize();
 
 		return unmodifiableList( serviceInitiators );

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

@@ -0,0 +1,40 @@
+/* Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.reactive.provider.service;
+
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.query.results.ResultSetMapping;
+import org.hibernate.query.results.ResultSetMappingImpl;
+import org.hibernate.reactive.sql.results.ReactiveResultSetMapping;
+import org.hibernate.reactive.sql.results.internal.ReactiveStandardValuesMappingProducer;
+import org.hibernate.sql.ast.tree.select.SelectStatement;
+import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer;
+import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducerProvider;
+
+public class ReactiveValuesMappingProducerProvider implements JdbcValuesMappingProducerProvider {
+	/**
+	 * Singleton access
+	 */
+	public static final ReactiveValuesMappingProducerProvider INSTANCE = new ReactiveValuesMappingProducerProvider();
+
+	@Override
+	public JdbcValuesMappingProducer buildMappingProducer(
+			SelectStatement sqlAst,
+			SessionFactoryImplementor sessionFactory) {
+		return new ReactiveStandardValuesMappingProducer(
+				sqlAst.getQuerySpec().getSelectClause().getSqlSelections(),
+				sqlAst.getDomainResultDescriptors()
+		);
+	}
+
+	@Override
+	public ResultSetMapping buildResultSetMapping(
+			String name,
+			boolean isDynamic,
+			SessionFactoryImplementor sessionFactory) {
+		return new ReactiveResultSetMapping( new ResultSetMappingImpl( name, isDynamic ) );
+	}
+}

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

@@ -0,0 +1,32 @@
+/* Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.reactive.provider.service;
+
+import java.util.Map;
+
+import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.service.spi.ServiceRegistryImplementor;
+import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducerProvider;
+
+public class ReactiveValuesMappingProducerProviderInitiator implements StandardServiceInitiator<JdbcValuesMappingProducerProvider> {
+	/**
+	 * Singleton access
+	 */
+	public static final ReactiveValuesMappingProducerProviderInitiator INSTANCE = new ReactiveValuesMappingProducerProviderInitiator();
+
+	@Override
+	public JdbcValuesMappingProducerProvider initiateService(
+			Map<String, Object> configurationValues,
+			ServiceRegistryImplementor registry) {
+		return ReactiveValuesMappingProducerProvider.INSTANCE;
+	}
+
+	@Override
+	public Class<JdbcValuesMappingProducerProvider> getServiceInitiated() {
+		return JdbcValuesMappingProducerProvider.class;
+	}
+
+}

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/ReactiveResultSetMapping.java

@@ -6,6 +6,8 @@
 package org.hibernate.reactive.sql.results;
 
 import java.lang.invoke.MethodHandles;
+import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CompletionStage;
 import java.util.function.BiConsumer;
@@ -32,7 +34,8 @@ public class ReactiveResultSetMapping implements ResultSetMapping, ReactiveValue
 	private final ResultSetMapping delegate;
 
 	public ReactiveResultSetMapping(ResultSetMapping resultSetMapping) {
-		this.delegate = resultSetMapping;
+		this.delegate = Objects.requireNonNull( resultSetMapping );
+		assert !(resultSetMapping instanceof ReactiveResultSetMapping) : "double wrapping detected!";
 	}
 
 	@Override
@@ -42,7 +45,7 @@ public JdbcValuesMapping resolve(JdbcValuesMetadata jdbcResultsMetadata, Session
 
 	@Override
 	public void addAffectedTableNames(Set<String> affectedTableNames, SessionFactoryImplementor sessionFactory) {
-
+		delegate.addAffectedTableNames( affectedTableNames, sessionFactory );
 	}
 
 	public CompletionStage<JdbcValuesMapping> reactiveResolve(JdbcValuesMetadata jdbcResultsMetadata, SessionFactoryImplementor sessionFactory) {
@@ -51,11 +54,26 @@ public CompletionStage<JdbcValuesMapping> reactiveResolve(JdbcValuesMetadata jdb
 				.thenApply( columnCount -> delegate.resolve(  jdbcResultsMetadata, sessionFactory ) );
 	}
 
+	@Override
+	public String getMappingIdentifier() {
+		return delegate.getMappingIdentifier();
+	}
+
+	@Override
+	public boolean isDynamic() {
+		return delegate.isDynamic();
+	}
+
 	@Override
 	public int getNumberOfResultBuilders() {
 		return delegate.getNumberOfResultBuilders();
 	}
 
+	@Override
+	public List<ResultBuilder> getResultBuilders() {
+		return delegate.getResultBuilders();
+	}
+
 	@Override
 	public void visitResultBuilders(BiConsumer<Integer, ResultBuilder> resultBuilderConsumer) {
 		delegate.visitResultBuilders( resultBuilderConsumer );