diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinySessionImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinySessionImpl.java index 1efc93cab..5a31741be 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinySessionImpl.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinySessionImpl.java @@ -33,7 +33,7 @@ import org.hibernate.reactive.mutiny.Mutiny.Query; import org.hibernate.reactive.mutiny.Mutiny.SelectionQuery; import org.hibernate.reactive.pool.ReactiveConnection; -import org.hibernate.reactive.query.sqm.iternal.ReactiveQuerySqmImpl; +import org.hibernate.reactive.query.sqm.internal.ReactiveQuerySqmImpl; import org.hibernate.reactive.session.ReactiveConnectionSupplier; import org.hibernate.reactive.session.ReactiveQueryProducer; import org.hibernate.reactive.session.ReactiveSession; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/spi/ReactiveAbstractSelectionQuery.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/spi/ReactiveAbstractSelectionQuery.java index c18d46311..15ecbea72 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/spi/ReactiveAbstractSelectionQuery.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/spi/ReactiveAbstractSelectionQuery.java @@ -30,8 +30,8 @@ import org.hibernate.query.sqm.tree.select.SqmSelectStatement; import org.hibernate.reactive.logging.impl.Log; import org.hibernate.reactive.logging.impl.LoggerFactory; -import org.hibernate.reactive.query.sqm.iternal.AggregatedSelectReactiveQueryPlan; -import org.hibernate.reactive.query.sqm.iternal.ConcreteSqmSelectReactiveQueryPlan; +import org.hibernate.reactive.query.sqm.internal.AggregatedSelectReactiveQueryPlan; +import org.hibernate.reactive.query.sqm.internal.ConcreteSqmSelectReactiveQueryPlan; import org.hibernate.reactive.query.sqm.spi.ReactiveSelectQueryPlan; import org.hibernate.sql.results.internal.TupleMetadata; @@ -52,9 +52,9 @@ public class ReactiveAbstractSelectionQuery { private final Supplier queryOptionsSupplier; - private SharedSessionContractImplementor session; + private final SharedSessionContractImplementor session; private final Supplier>> doList; - private final Supplier getStatement; + private final Supplier> getStatement; private final Supplier getTupleMetadata; @@ -66,7 +66,7 @@ public class ReactiveAbstractSelectionQuery { private final Runnable beforeQuery; private final Consumer afterQuery; - private Function, R> uniqueElement; + private final Function, R> uniqueElement; private final InterpretationsKeySource interpretationsKeySource; // I'm sure we can avoid some of this by making some methods public in ORM, @@ -75,7 +75,7 @@ public ReactiveAbstractSelectionQuery( InterpretationsKeySource interpretationKeySource, SharedSessionContractImplementor session, Supplier>> doList, - Supplier getStatement, + Supplier> getStatement, Supplier getTupleMetadata, Supplier getDomainParameterXref, Supplier> getResultType, @@ -98,40 +98,12 @@ public ReactiveAbstractSelectionQuery( interpretationKeySource ); } -// -// public ReactiveAbstractSelectionQuery( -// DomainQueryExecutionContext domainQueryExecutionContext, -// SharedSessionContractImplementor session, -// Supplier>> doList, -// Supplier getStatement, -// Supplier getTupleMetadata, -// Supplier getDomainParameterXref, -// Supplier> getResultType, -// Supplier getQueryString, -// Runnable beforeQuery, -// Consumer afterQuery, -// Function, R> uniqueElement) { -// this( -// domainQueryExecutionContext::getQueryOptions, -// session, -// doList, -// getStatement, -// getTupleMetadata, -// getDomainParameterXref, -// getResultType, -// getQueryString, -// beforeQuery, -// afterQuery, -// uniqueElement, -// null -// ); -// } public ReactiveAbstractSelectionQuery( Supplier queryOptionsSupplier, SharedSessionContractImplementor session, Supplier>> doList, - Supplier getStatement, + Supplier> getStatement, Supplier getTupleMetadata, Supplier getDomainParameterXref, Supplier> getResultType, @@ -292,7 +264,7 @@ private CompletionStage> doReactiveList() { return doList.get(); } - public SqmStatement getSqmStatement() { + public SqmStatement getSqmStatement() { return getStatement.get(); } @@ -329,7 +301,7 @@ public List list() { } public Stream getResultStream() { - throw LOG.nonReactiveMethodCall( "" ); + throw LOG.nonReactiveMethodCall( "" ); } public R uniqueResult() { diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/spi/ReactiveNativeSelectQueryPlan.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/spi/ReactiveNativeSelectQueryPlan.java index 16aac43ff..5bdd253d2 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/spi/ReactiveNativeSelectQueryPlan.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/spi/ReactiveNativeSelectQueryPlan.java @@ -16,7 +16,7 @@ import org.hibernate.reactive.logging.impl.LoggerFactory; import org.hibernate.reactive.query.sqm.spi.ReactiveSelectQueryPlan; -public interface ReactiveNativeSelectQueryPlan extends NativeSelectQueryPlan, ReactiveSelectQueryPlan { +public interface ReactiveNativeSelectQueryPlan extends NativeSelectQueryPlan, ReactiveSelectQueryPlan { Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() ); /** diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/internal/ReactiveNativeQueryImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/internal/ReactiveNativeQueryImpl.java index 74ea97b8a..031d961f7 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/internal/ReactiveNativeQueryImpl.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/internal/ReactiveNativeQueryImpl.java @@ -62,11 +62,6 @@ public class ReactiveNativeQueryImpl extends NativeQueryImpl private final ReactiveAbstractSelectionQuery selectionQueryDelegate; - public ReactiveNativeQueryImpl(String memento, SharedSessionContractImplementor session, String[] querySpaces) { - this( memento, session ); - addQuerySpaces( querySpaces ); - } - public ReactiveNativeQueryImpl(String memento, SharedSessionContractImplementor session) { super( memento, session ); this.selectionQueryDelegate = createSelectionQueryDelegate( session ); diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/internal/ReactiveNativeSelectQueryPlanImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/internal/ReactiveNativeSelectQueryPlanImpl.java index 781ad06b4..be7910d0e 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/internal/ReactiveNativeSelectQueryPlanImpl.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/internal/ReactiveNativeSelectQueryPlanImpl.java @@ -36,10 +36,10 @@ import static java.util.Collections.emptyList; import static org.hibernate.reactive.util.impl.CompletionStages.completedFuture; -public class ReactiveNativeSelectQueryPlanImpl extends NativeSelectQueryPlanImpl implements ReactiveNativeSelectQueryPlan { +public class ReactiveNativeSelectQueryPlanImpl extends NativeSelectQueryPlanImpl implements ReactiveNativeSelectQueryPlan { private final Set affectedTableNames; - private String sql; + private final String sql; private final List parameterList; private final JdbcValuesMappingProducer resultSetMapping; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/spi/ReactiveNamedSqmQueryMemento.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/spi/ReactiveNamedSqmQueryMemento.java index 8c3826630..af7a9ba7c 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/spi/ReactiveNamedSqmQueryMemento.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/spi/ReactiveNamedSqmQueryMemento.java @@ -20,8 +20,8 @@ import org.hibernate.query.sqm.spi.NamedSqmQueryMemento; import org.hibernate.query.sqm.tree.SqmStatement; import org.hibernate.query.sqm.tree.select.SqmSelectStatement; -import org.hibernate.reactive.query.sqm.iternal.ReactiveQuerySqmImpl; -import org.hibernate.reactive.query.sqm.iternal.ReactiveSqmSelectionQueryImpl; +import org.hibernate.reactive.query.sqm.internal.ReactiveQuerySqmImpl; +import org.hibernate.reactive.query.sqm.internal.ReactiveSqmSelectionQueryImpl; /** * @see org.hibernate.query.sql.spi.NamedNativeQueryMemento diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/AggregatedSelectReactiveQueryPlan.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/AggregatedSelectReactiveQueryPlan.java similarity index 98% rename from hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/AggregatedSelectReactiveQueryPlan.java rename to hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/AggregatedSelectReactiveQueryPlan.java index 11adb1efe..84e6d41b0 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/AggregatedSelectReactiveQueryPlan.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/AggregatedSelectReactiveQueryPlan.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.reactive.query.sqm.iternal; +package org.hibernate.reactive.query.sqm.internal; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ConcreteSqmSelectReactiveQueryPlan.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ConcreteSqmSelectReactiveQueryPlan.java similarity index 95% rename from hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ConcreteSqmSelectReactiveQueryPlan.java rename to hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ConcreteSqmSelectReactiveQueryPlan.java index 8a5130088..16135b9a2 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ConcreteSqmSelectReactiveQueryPlan.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ConcreteSqmSelectReactiveQueryPlan.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.reactive.query.sqm.iternal; +package org.hibernate.reactive.query.sqm.internal; import java.util.List; import java.util.Map; @@ -119,10 +119,10 @@ public ScrollableResultsImplementor performScroll(ScrollMode scrollMode, Doma public CompletionStage> reactivePerformList(DomainQueryExecutionContext executionContext) { return executionContext.getQueryOptions().getEffectiveLimit().getMaxRowsJpa() == 0 ? completedFuture( emptyList() ) - : withCacheableSqmInterpretation( executionContext, null, listInterpreter ); + : withCacheableSqmInterpretation( executionContext, listInterpreter ); } - private CompletionStage withCacheableSqmInterpretation(DomainQueryExecutionContext executionContext, X context, SqmInterpreter interpreter) { + private CompletionStage withCacheableSqmInterpretation(DomainQueryExecutionContext executionContext, SqmInterpreter interpreter) { // NOTE : VERY IMPORTANT - intentional double-lock checking // The other option would be to leverage `java.util.concurrent.locks.ReadWriteLock` // to protect access. However, synchronized is much simpler here. We will verify @@ -162,7 +162,7 @@ private CompletionStage withCacheableSqmInterpretation(DomainQueryExec jdbcParameterBindings = createJdbcParameterBindings( localCopy, executionContext ); } - return interpreter.interpret( context, executionContext, localCopy, jdbcParameterBindings ); + return interpreter.interpret( null, executionContext, localCopy, jdbcParameterBindings ); } private JdbcParameterBindings createJdbcParameterBindings(CacheableSqmInterpretation sqmInterpretation, DomainQueryExecutionContext executionContext) { @@ -296,13 +296,5 @@ Map, Map, List> public Map, MappingModelExpressible> getSqmParameterMappingModelTypes() { return sqmParameterMappingModelTypes; } - - JdbcParameterBindings getFirstParameterBindings() { - return firstParameterBindings; - } - - void setFirstParameterBindings(JdbcParameterBindings firstParameterBindings) { - this.firstParameterBindings = firstParameterBindings; - } } } diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveMultiTableDeleteQueryPlan.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveMultiTableDeleteQueryPlan.java similarity index 91% rename from hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveMultiTableDeleteQueryPlan.java rename to hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveMultiTableDeleteQueryPlan.java index 01c9f95bd..90bdf6c49 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveMultiTableDeleteQueryPlan.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveMultiTableDeleteQueryPlan.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.reactive.query.sqm.iternal; +package org.hibernate.reactive.query.sqm.internal; import java.util.concurrent.CompletionStage; @@ -18,12 +18,12 @@ * @see org.hibernate.query.sqm.internal.MultiTableDeleteQueryPlan */ public class ReactiveMultiTableDeleteQueryPlan implements ReactiveNonSelectQueryPlan { - private final SqmDeleteStatement sqmDelete; + private final SqmDeleteStatement sqmDelete; private final DomainParameterXref domainParameterXref; private final ReactiveSqmMultiTableMutationStrategy deleteStrategy; public ReactiveMultiTableDeleteQueryPlan( - SqmDeleteStatement sqmDelete, + SqmDeleteStatement sqmDelete, DomainParameterXref domainParameterXref, ReactiveSqmMultiTableMutationStrategy deleteStrategy) { this.sqmDelete = sqmDelete; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveMultiTableInsertQueryPlan.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveMultiTableInsertQueryPlan.java similarity index 96% rename from hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveMultiTableInsertQueryPlan.java rename to hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveMultiTableInsertQueryPlan.java index 8edf5a427..ed0e68b01 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveMultiTableInsertQueryPlan.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveMultiTableInsertQueryPlan.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.reactive.query.sqm.iternal; +package org.hibernate.reactive.query.sqm.internal; import java.util.concurrent.CompletionStage; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveMultiTableUpdateQueryPlan.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveMultiTableUpdateQueryPlan.java similarity index 91% rename from hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveMultiTableUpdateQueryPlan.java rename to hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveMultiTableUpdateQueryPlan.java index 039dc551a..605186079 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveMultiTableUpdateQueryPlan.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveMultiTableUpdateQueryPlan.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.reactive.query.sqm.iternal; +package org.hibernate.reactive.query.sqm.internal; import java.util.concurrent.CompletionStage; @@ -18,12 +18,12 @@ * @see org.hibernate.query.sqm.internal.MultiTableUpdateQueryPlan */ public class ReactiveMultiTableUpdateQueryPlan implements ReactiveNonSelectQueryPlan { - private final SqmUpdateStatement sqmUpdate; + private final SqmUpdateStatement sqmUpdate; private final DomainParameterXref domainParameterXref; private final ReactiveSqmMultiTableMutationStrategy mutationStrategy; public ReactiveMultiTableUpdateQueryPlan( - SqmUpdateStatement sqmUpdate, + SqmUpdateStatement sqmUpdate, DomainParameterXref domainParameterXref, ReactiveSqmMultiTableMutationStrategy mutationStrategy) { this.sqmUpdate = sqmUpdate; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveQuerySqmImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveQuerySqmImpl.java similarity index 99% rename from hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveQuerySqmImpl.java rename to hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveQuerySqmImpl.java index f476d64b5..e8a990382 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveQuerySqmImpl.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveQuerySqmImpl.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.reactive.query.sqm.iternal; +package org.hibernate.reactive.query.sqm.internal; import java.lang.invoke.MethodHandles; import java.time.Instant; @@ -57,7 +57,6 @@ import org.hibernate.reactive.logging.impl.LoggerFactory; import org.hibernate.reactive.query.spi.ReactiveAbstractSelectionQuery; import org.hibernate.reactive.query.sql.spi.ReactiveNonSelectQueryPlan; -import org.hibernate.reactive.query.sqm.internal.ReactiveAggregatedNonSelectQueryPlan; import org.hibernate.reactive.query.sqm.mutation.spi.ReactiveSqmMultiTableInsertStrategy; import org.hibernate.reactive.query.sqm.mutation.spi.ReactiveSqmMultiTableMutationStrategy; import org.hibernate.reactive.query.sqm.spi.ReactiveSelectQueryPlan; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveSimpleDeleteQueryPlan.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSimpleDeleteQueryPlan.java similarity index 99% rename from hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveSimpleDeleteQueryPlan.java rename to hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSimpleDeleteQueryPlan.java index f831d0756..f1899fb96 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveSimpleDeleteQueryPlan.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSimpleDeleteQueryPlan.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.reactive.query.sqm.iternal; +package org.hibernate.reactive.query.sqm.internal; import java.sql.PreparedStatement; import java.util.List; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveSimpleInsertQueryPlan.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSimpleInsertQueryPlan.java similarity index 94% rename from hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveSimpleInsertQueryPlan.java rename to hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSimpleInsertQueryPlan.java index cba5287a9..5e4710f93 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveSimpleInsertQueryPlan.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSimpleInsertQueryPlan.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.reactive.query.sqm.iternal; +package org.hibernate.reactive.query.sqm.internal; import java.util.List; @@ -11,7 +11,6 @@ import java.util.concurrent.CompletionStage; import org.hibernate.action.internal.BulkOperationCleanupAction; -import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.metamodel.mapping.MappingModelExpressible; @@ -62,8 +61,6 @@ public ReactiveSimpleInsertQueryPlan( public CompletionStage executeReactiveUpdate(DomainQueryExecutionContext executionContext) { BulkOperationCleanupAction.schedule( executionContext.getSession(), sqmInsert ); final SharedSessionContractImplementor session = executionContext.getSession(); - final SessionFactoryImplementor factory = session.getFactory(); - final JdbcServices jdbcServices = factory.getJdbcServices(); SqlAstTranslator insertTranslator = null; if ( jdbcInsert == null ) { insertTranslator = createInsertTranslator( executionContext ); @@ -73,7 +70,7 @@ public CompletionStage executeReactiveUpdate(DomainQueryExecutionContex executionContext.getQueryParameterBindings(), domainParameterXref, jdbcParamsXref, - factory.getRuntimeMetamodels().getMappingMetamodel(), + session.getFactory().getRuntimeMetamodels().getMappingMetamodel(), tableGroupAccess::findTableGroup, new SqmParameterMappingModelResolutionAccess() { @Override @SuppressWarnings("unchecked") diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveSimpleUpdateQueryPlan.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSimpleUpdateQueryPlan.java similarity index 96% rename from hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveSimpleUpdateQueryPlan.java rename to hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSimpleUpdateQueryPlan.java index 068cb7f18..c3bc21dc5 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveSimpleUpdateQueryPlan.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSimpleUpdateQueryPlan.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.reactive.query.sqm.iternal; +package org.hibernate.reactive.query.sqm.internal; import java.util.List; import java.util.Map; @@ -57,7 +57,6 @@ public ReactiveSimpleUpdateQueryPlan(SqmUpdateStatement sqmUpdate, DomainPara public CompletionStage executeReactiveUpdate(DomainQueryExecutionContext executionContext) { BulkOperationCleanupAction.schedule( executionContext.getSession(), sqmUpdate ); final SharedSessionContractImplementor session = executionContext.getSession(); - final SessionFactoryImplementor factory = session.getFactory(); SqlAstTranslator updateTranslator = null; if ( jdbcUpdate == null ) { updateTranslator = createUpdateTranslator( executionContext ); @@ -67,7 +66,7 @@ public CompletionStage executeReactiveUpdate(DomainQueryExecutionContex executionContext.getQueryParameterBindings(), domainParameterXref, jdbcParamsXref, - factory.getRuntimeMetamodels().getMappingMetamodel(), + session.getFactory().getRuntimeMetamodels().getMappingMetamodel(), tableGroupAccess::findTableGroup, new SqmParameterMappingModelResolutionAccess() { @Override diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveSqmSelectionQueryImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSqmSelectionQueryImpl.java similarity index 95% rename from hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveSqmSelectionQueryImpl.java rename to hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSqmSelectionQueryImpl.java index 0f461820f..42b11a316 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/iternal/ReactiveSqmSelectionQueryImpl.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSqmSelectionQueryImpl.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.reactive.query.sqm.iternal; +package org.hibernate.reactive.query.sqm.internal; import java.time.Instant; @@ -28,8 +28,6 @@ import org.hibernate.query.BindableType; import org.hibernate.query.QueryLogging; import org.hibernate.query.QueryParameter; -import org.hibernate.query.criteria.internal.NamedCriteriaQueryMementoImpl; -import org.hibernate.query.hql.internal.NamedHqlQueryMementoImpl; import org.hibernate.query.internal.DelegatingDomainQueryExecutionContext; import org.hibernate.query.spi.AbstractSelectionQuery; import org.hibernate.query.spi.DomainQueryExecutionContext; @@ -67,22 +65,6 @@ public ReactiveSqmSelectionQueryImpl( this.selectionQueryDelegate = createSelectionQueryDelegate( session ); } - public ReactiveSqmSelectionQueryImpl( - NamedHqlQueryMementoImpl memento, - Class resultType, - SharedSessionContractImplementor session) { - super( memento, resultType, session ); - this.selectionQueryDelegate = createSelectionQueryDelegate( session ); - } - - public ReactiveSqmSelectionQueryImpl( - NamedCriteriaQueryMementoImpl memento, - Class resultType, - SharedSessionContractImplementor session) { - super( memento, resultType, session ); - this.selectionQueryDelegate = createSelectionQueryDelegate( session ); - } - public ReactiveSqmSelectionQueryImpl( SqmSelectStatement criteria, Class expectedResultType, @@ -251,7 +233,7 @@ public ReactiveSqmSelectionQueryImpl setHibernateLockMode(LockMode lockMode) return this; } - @Override + @Override @Deprecated public ReactiveSqmSelectionQueryImpl setAliasSpecificLockMode(String alias, LockMode lockMode) { super.setAliasSpecificLockMode( alias, lockMode ); return this; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/ReactiveSqmMutationStrategyHelper.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/ReactiveSqmMutationStrategyHelper.java index 0db3d8686..575a69683 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/ReactiveSqmMutationStrategyHelper.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/ReactiveSqmMutationStrategyHelper.java @@ -32,81 +32,77 @@ * @see org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper */ public class ReactiveSqmMutationStrategyHelper { - /** - * Singleton access - */ - public static final ReactiveSqmMutationStrategyHelper INSTANCE = new ReactiveSqmMutationStrategyHelper(); private ReactiveSqmMutationStrategyHelper() { } - public static CompletionStage visitCollectionTables(EntityMappingType entityDescriptor, Consumer consumer) { - if ( !entityDescriptor.getEntityPersister().hasCollections() ) { - // none to clean-up - return voidFuture(); - } - - final CompletableFuture stage = new CompletableFuture(); - try { - entityDescriptor.visitSubTypeAttributeMappings( - attributeMapping -> { - if ( attributeMapping instanceof PluralAttributeMapping ) { - try { - consumer.accept( (PluralAttributeMapping) attributeMapping ); - complete( stage, null ); - } - catch (Throwable throwable) { - complete( stage, throwable ); - } - } - else if ( attributeMapping instanceof EmbeddedAttributeMapping ) { - visitCollectionTables( (EmbeddedAttributeMapping) attributeMapping, consumer ) - .whenComplete( (v, throwable) -> complete( stage, throwable ) ); - } - else { - complete( stage, null ); - } - } ); - return stage; - } - catch (Throwable throwable) { - complete( stage, throwable ); - return stage; - } - } - - private static CompletionStage visitCollectionTables(EmbeddedAttributeMapping attributeMapping, Consumer consumer) { - final CompletableFuture stage = new CompletableFuture<>(); - - try { - attributeMapping.visitSubParts( - modelPart -> { - if ( modelPart instanceof PluralAttributeMapping ) { - try { - consumer.accept( (PluralAttributeMapping) modelPart ); - complete( stage, null ); - } - catch (Throwable throwable) { - complete( stage, throwable ); - } - } - else if ( modelPart instanceof EmbeddedAttributeMapping ) { - visitCollectionTables( (EmbeddedAttributeMapping) modelPart, consumer ) - .whenComplete( (v, throwable) -> complete( stage, throwable ) ); - } - else { - complete( stage, null ); - } - }, - null - ); - return stage; - } - catch (Throwable t) { - complete( stage, t ); - return stage; - } - } +// public static CompletionStage visitCollectionTables(EntityMappingType entityDescriptor, Consumer consumer) { +// if ( !entityDescriptor.getEntityPersister().hasCollections() ) { +// // none to clean-up +// return voidFuture(); +// } +// +// final CompletableFuture stage = new CompletableFuture<>(); +// try { +// entityDescriptor.visitSubTypeAttributeMappings( +// attributeMapping -> { +// if ( attributeMapping instanceof PluralAttributeMapping ) { +// try { +// consumer.accept( (PluralAttributeMapping) attributeMapping ); +// complete( stage, null ); +// } +// catch (Throwable throwable) { +// complete( stage, throwable ); +// } +// } +// else if ( attributeMapping instanceof EmbeddedAttributeMapping ) { +// visitCollectionTables( (EmbeddedAttributeMapping) attributeMapping, consumer ) +// .whenComplete( (v, throwable) -> complete( stage, throwable ) ); +// } +// else { +// complete( stage, null ); +// } +// } ); +// return stage; +// } +// catch (Throwable throwable) { +// complete( stage, throwable ); +// return stage; +// } +// } + +// private static CompletionStage visitCollectionTables(EmbeddedAttributeMapping attributeMapping, Consumer consumer) { +// final CompletableFuture stage = new CompletableFuture<>(); +// +// try { +// attributeMapping.visitSubParts( +// modelPart -> { +// if ( modelPart instanceof PluralAttributeMapping ) { +// try { +// consumer.accept( (PluralAttributeMapping) modelPart ); +// complete( stage, null ); +// } +// catch (Throwable throwable) { +// complete( stage, throwable ); +// } +// } +// else if ( modelPart instanceof EmbeddedAttributeMapping ) { +// visitCollectionTables( (EmbeddedAttributeMapping) modelPart, consumer ) +// .whenComplete( (v, throwable) -> complete( stage, throwable ) ); +// } +// else { +// complete( stage, null ); +// } +// }, +// null +// ); +// return stage; +// } +// catch (Throwable t) { +// complete( stage, t ); +// return stage; +// } +// } public static CompletionStage cleanUpCollectionTables( EntityMappingType entityDescriptor, diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/cte/ReactiveAbstractCteMutationHandler.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/cte/ReactiveAbstractCteMutationHandler.java index e5ad10995..635b5cb76 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/cte/ReactiveAbstractCteMutationHandler.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/cte/ReactiveAbstractCteMutationHandler.java @@ -78,7 +78,7 @@ void addDmlCtes( */ @Override default CompletionStage reactiveExecute(DomainQueryExecutionContext executionContext) { - final SqmDeleteOrUpdateStatement sqmMutationStatement = getSqmDeleteOrUpdateStatement(); + final SqmDeleteOrUpdateStatement sqmMutationStatement = getSqmDeleteOrUpdateStatement(); final SessionFactoryImplementor factory = executionContext.getSession().getFactory(); final EntityMappingType entityDescriptor = getEntityDescriptor(); final String explicitDmlTargetAlias; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveExecuteWithTemporaryTableHelper.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveExecuteWithTemporaryTableHelper.java index 785823694..7f1444496 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveExecuteWithTemporaryTableHelper.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveExecuteWithTemporaryTableHelper.java @@ -71,7 +71,6 @@ public static CompletionStage saveMatchingIdsIntoIdTable( Function sessionUidAccess, JdbcParameterBindings jdbcParameterBindings, ExecutionContext executionContext) { - final SessionFactoryImplementor factory = executionContext.getSession().getFactory(); final TableGroup mutatingTableGroup = sqmConverter.getMutatingTableGroup(); diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveGlobalTemporaryTableInsertStrategy.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveGlobalTemporaryTableInsertStrategy.java index 21b3184f0..ce76569ce 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveGlobalTemporaryTableInsertStrategy.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveGlobalTemporaryTableInsertStrategy.java @@ -23,9 +23,9 @@ public class ReactiveGlobalTemporaryTableInsertStrategy extends GlobalTemporaryTableStrategy implements ReactiveGlobalTemporaryTableStrategy, ReactiveSqmMultiTableInsertStrategy { - private final CompletableFuture tableCreatedStage = new CompletableFuture(); + private final CompletableFuture tableCreatedStage = new CompletableFuture<>(); - private final CompletableFuture tableDroppedStage = new CompletableFuture(); + private final CompletableFuture tableDroppedStage = new CompletableFuture<>(); private boolean prepared; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveGlobalTemporaryTableMutationStrategy.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveGlobalTemporaryTableMutationStrategy.java index 52955ab50..15c2bd293 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveGlobalTemporaryTableMutationStrategy.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveGlobalTemporaryTableMutationStrategy.java @@ -24,9 +24,9 @@ public class ReactiveGlobalTemporaryTableMutationStrategy extends GlobalTemporaryTableStrategy implements ReactiveGlobalTemporaryTableStrategy, ReactiveSqmMultiTableMutationStrategy { - private final CompletableFuture tableCreatedStage = new CompletableFuture(); + private final CompletableFuture tableCreatedStage = new CompletableFuture<>(); - private final CompletableFuture tableDroppedStage = new CompletableFuture(); + private final CompletableFuture tableDroppedStage = new CompletableFuture<>(); private boolean prepared; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveLocalTemporaryTableInsertStrategy.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveLocalTemporaryTableInsertStrategy.java index df3a8856b..3d6681881 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveLocalTemporaryTableInsertStrategy.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveLocalTemporaryTableInsertStrategy.java @@ -5,7 +5,6 @@ */ package org.hibernate.reactive.query.sqm.mutation.internal.temptable; -import java.lang.invoke.MethodHandles; import java.util.concurrent.CompletionStage; import org.hibernate.engine.spi.SharedSessionContractImplementor; @@ -14,15 +13,11 @@ import org.hibernate.query.sqm.mutation.internal.temptable.AfterUseAction; import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableInsertStrategy; import org.hibernate.query.sqm.tree.insert.SqmInsertStatement; -import org.hibernate.reactive.logging.impl.Log; -import org.hibernate.reactive.logging.impl.LoggerFactory; import org.hibernate.reactive.query.sqm.mutation.spi.ReactiveSqmMultiTableInsertStrategy; public class ReactiveLocalTemporaryTableInsertStrategy extends LocalTemporaryTableInsertStrategy implements ReactiveSqmMultiTableInsertStrategy { - private static final Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() ); - public ReactiveLocalTemporaryTableInsertStrategy(LocalTemporaryTableInsertStrategy insertStrategy) { super( insertStrategy.getTemporaryTable(), insertStrategy.getSessionFactory() ); } diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveLocalTemporaryTableMutationStrategy.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveLocalTemporaryTableMutationStrategy.java index 2e4283a09..7ad636c65 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveLocalTemporaryTableMutationStrategy.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveLocalTemporaryTableMutationStrategy.java @@ -22,8 +22,6 @@ public class ReactiveLocalTemporaryTableMutationStrategy extends LocalTemporaryTableMutationStrategy implements ReactiveSqmMultiTableMutationStrategy { - private static final Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() ); - public ReactiveLocalTemporaryTableMutationStrategy(LocalTemporaryTableMutationStrategy mutationStrategy) { super( mutationStrategy.getTemporaryTable(), mutationStrategy.getSessionFactory() ); } diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactivePersistentTableInsertStrategy.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactivePersistentTableInsertStrategy.java index 34273784c..9a44a44cf 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactivePersistentTableInsertStrategy.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactivePersistentTableInsertStrategy.java @@ -20,9 +20,9 @@ public class ReactivePersistentTableInsertStrategy extends PersistentTableInsertStrategy implements ReactivePersistentTableStrategy, ReactiveSqmMultiTableInsertStrategy { - private final CompletableFuture tableCreatedStage = new CompletableFuture(); + private final CompletableFuture tableCreatedStage = new CompletableFuture<>(); - private final CompletableFuture tableDroppedStage = new CompletableFuture(); + private final CompletableFuture tableDroppedStage = new CompletableFuture<>(); private boolean prepared; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactivePersistentTableMutationStrategy.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactivePersistentTableMutationStrategy.java index eb82f7ad3..57cd14f4b 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactivePersistentTableMutationStrategy.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactivePersistentTableMutationStrategy.java @@ -22,9 +22,9 @@ public class ReactivePersistentTableMutationStrategy extends PersistentTableMutationStrategy implements ReactivePersistentTableStrategy, ReactiveSqmMultiTableMutationStrategy { - private final CompletableFuture tableCreatedStage = new CompletableFuture(); + private final CompletableFuture tableCreatedStage = new CompletableFuture<>(); - private final CompletableFuture tableDroppedStage = new CompletableFuture(); + private final CompletableFuture tableDroppedStage = new CompletableFuture<>(); private boolean prepared; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveRestrictedDeleteExecutionDelegate.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveRestrictedDeleteExecutionDelegate.java index f9d4336f6..bc246c682 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveRestrictedDeleteExecutionDelegate.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveRestrictedDeleteExecutionDelegate.java @@ -155,8 +155,8 @@ public CompletionStage reactiveExecute(DomainQueryExecutionContext exec // Use the converter to interpret the where-clause. We do this for 2 reasons: // 1) the resolved Predicate is ultimately the base for applying restriction to the deletes // 2) we also inspect each ColumnReference that is part of the where-clause to see which - // table it comes from. if all of the referenced columns (if any at all) are from the root table - // we can perform all of the deletes without using an id-table + // table it comes from. If all the referenced columns (if any at all) are from the root table + // we can perform all the deletes without using an id-table final MutableBoolean needsIdTableWrapper = new MutableBoolean( false ); final Predicate specifiedRestriction = converter.visitWhereClause( sqmDelete.getWhereClause(), @@ -221,7 +221,7 @@ public CompletionStage reactiveExecute(DomainQueryExecutionContext exec } } - private CompletionStage executeWithoutIdTable( + private CompletionStage executeWithoutIdTable( Predicate suppliedPredicate, TableGroup tableGroup, Map, List>> restrictionSqmParameterResolutions, @@ -307,8 +307,9 @@ public MappingModelExpressible getResolvedMappingModelType(SqmParameter[] deleteFromNonRootStages = new CompletionStage[] { voidFuture() }; if ( rootTableReference instanceof UnionTableReference ) { - final CompletionStage[] deleteFromNonRootStages = new CompletionStage[] { voidFuture() }; final MutableInteger rows = new MutableInteger(); return cleanUpCollectionTablesStage .thenCompose( v -> visitUnionTableReferences( @@ -324,8 +325,6 @@ public MappingModelExpressible getResolvedMappingModelType(SqmParameter rows.get() ); } else { - final CompletionStage[] deleteFromNonRootStages = new CompletionStage[] { voidFuture() }; - entityDescriptor.visitConstraintOrderedTables( (tableExpression, tableKeyColumnVisitationSupplier) -> { if ( !tableExpression.equals( rootTableName ) ) { @@ -641,8 +640,6 @@ private CompletionStage deleteFromTableUsingIdTable( ExecutionContext executionContext) { LOG.tracef( "deleteFromTableUsingIdTable - %s", tableExpression ); - final SessionFactoryImplementor factory = executionContext.getSession().getFactory(); - final TableKeyExpressionCollector keyColumnCollector = new TableKeyExpressionCollector( entityDescriptor ); final NamedTableReference targetTable = new NamedTableReference( tableExpression, diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveTemporaryTableHelper.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveTemporaryTableHelper.java index 9e4134a5d..d027235a2 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveTemporaryTableHelper.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveTemporaryTableHelper.java @@ -6,7 +6,6 @@ package org.hibernate.reactive.query.sqm.mutation.internal.temptable; import java.lang.invoke.MethodHandles; -import java.sql.SQLWarning; import java.util.concurrent.CompletionStage; import java.util.function.Function; @@ -14,7 +13,6 @@ import org.hibernate.dialect.temptable.TemporaryTableExporter; import org.hibernate.engine.jdbc.internal.FormatStyle; import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.engine.jdbc.spi.SqlStatementLogger; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; @@ -166,22 +164,6 @@ private static ReactiveConnection reactiveConnection(SharedSessionContractImplem return ( (ReactiveConnectionSupplier) session ).getReactiveConnection(); } - private static SqlExceptionHelper.WarningHandler WARNING_HANDLER = new SqlExceptionHelper.WarningHandlerLoggingSupport() { - public boolean doProcess() { - return LOG.isDebugEnabled(); - } - - public void prepare(SQLWarning warning) { - LOG.warningsCreatingTempTable( warning ); - } - - @Override - protected void logWarning(String description, String message) { - LOG.debug( description ); - LOG.debug( message ); - } - }; - private static void logException(String action, String creationCommand, TemporaryTable temporaryTable, Throwable throwable) { if ( throwable != null ) { if ( creationCommand != null ) { @@ -203,11 +185,6 @@ private static void logException(String action, String creationCommand, Temporar } } - private static void logException(String sql, JdbcServices jdbcServices) { - final SqlStatementLogger statementLogger = jdbcServices.getSqlStatementLogger(); - statementLogger.logStatement( sql, FormatStyle.BASIC.getFormatter() ); - } - private static void logStatement(String sql, JdbcServices jdbcServices) { final SqlStatementLogger statementLogger = jdbcServices.getSqlStatementLogger(); statementLogger.logStatement( sql, FormatStyle.BASIC.getFormatter() ); diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveUpdateExecutionDelegate.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveUpdateExecutionDelegate.java index 9a66bd8d3..1e3092e96 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveUpdateExecutionDelegate.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/temptable/ReactiveUpdateExecutionDelegate.java @@ -120,7 +120,7 @@ public CompletionStage reactiveExecute(ExecutionContext executionContex executionContext ); - CompletionStage[] resultStage = new CompletionStage[] { voidFuture() }; + final CompletionStage[] resultStage = new CompletionStage[] { voidFuture() }; getEntityDescriptor().visitConstraintOrderedTables( (tableExpression, tableKeyColumnVisitationSupplier) -> resultStage[0] = resultStage[0].thenCompose( v -> reactiveUpdateTable( diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/spi/ReactiveNativeQueryInterpreter.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/spi/ReactiveNativeQueryInterpreter.java index af8d73bd9..d969e3ea6 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/spi/ReactiveNativeQueryInterpreter.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/spi/ReactiveNativeQueryInterpreter.java @@ -23,7 +23,7 @@ public void recognizeParameters(String nativeQuery, ParameterRecognizer recogniz @Override public NativeSelectQueryPlan createQueryPlan(NativeSelectQueryDefinition queryDefinition, SessionFactoryImplementor sessionFactory) { - return new ReactiveNativeSelectQueryPlanImpl( + return new ReactiveNativeSelectQueryPlanImpl<>( queryDefinition.getSqlString(), queryDefinition.getAffectedTableNames(), queryDefinition.getQueryParameterOccurrences(), diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java index 35fff4c44..fc03aa27e 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java @@ -117,8 +117,8 @@ import org.hibernate.reactive.query.ReactiveSelectionQuery; import org.hibernate.reactive.query.sql.internal.ReactiveNativeQueryImpl; import org.hibernate.reactive.query.sql.spi.ReactiveNativeQueryImplementor; -import org.hibernate.reactive.query.sqm.iternal.ReactiveQuerySqmImpl; -import org.hibernate.reactive.query.sqm.iternal.ReactiveSqmSelectionQueryImpl; +import org.hibernate.reactive.query.sqm.internal.ReactiveQuerySqmImpl; +import org.hibernate.reactive.query.sqm.internal.ReactiveSqmSelectionQueryImpl; import org.hibernate.reactive.session.ReactiveSession; import org.hibernate.reactive.util.impl.CompletionStages; diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java index fd5ccb671..198fbd101 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java @@ -80,8 +80,8 @@ import org.hibernate.reactive.query.ReactiveSelectionQuery; import org.hibernate.reactive.query.sql.internal.ReactiveNativeQueryImpl; import org.hibernate.reactive.query.sql.spi.ReactiveNativeQueryImplementor; -import org.hibernate.reactive.query.sqm.iternal.ReactiveQuerySqmImpl; -import org.hibernate.reactive.query.sqm.iternal.ReactiveSqmSelectionQueryImpl; +import org.hibernate.reactive.query.sqm.internal.ReactiveQuerySqmImpl; +import org.hibernate.reactive.query.sqm.internal.ReactiveSqmSelectionQueryImpl; import org.hibernate.reactive.session.ReactiveSqmQueryImplementor; import org.hibernate.reactive.session.ReactiveStatelessSession; import org.hibernate.tuple.entity.EntityMetamodel;