From 1b74f539ee347c1f16654f56b008aae7e73f548e Mon Sep 17 00:00:00 2001 From: Gavin King Date: Sat, 10 May 2025 18:29:49 +0200 Subject: [PATCH] move stuff out of org.hibernate.query.procedure to realize consistent SPI/API split --- .../internal/AbstractEntityInsertAction.java | 2 +- .../AbstractFlushingEventListener.java | 2 +- .../hibernate/procedure/FunctionReturn.java | 1 - .../hibernate/procedure/ProcedureCall.java | 1 - .../hibernate/procedure/ProcedureOutputs.java | 1 - .../procedure/ProcedureParameter.java | 2 +- .../procedure/internal/ProcedureCallImpl.java | 2 +- .../internal/ProcedureOutputsImpl.java | 2 +- .../internal/ProcedureParamBindings.java | 22 +++++++++---------- .../ProcedureParameterBindingImpl.java | 5 ++--- .../ProcedureParameterMetadataImpl.java | 21 +++++++++--------- .../spi}/ProcedureParameterBinding.java | 2 +- .../ProcedureParameterBindingImplementor.java | 13 ----------- .../spi/ProcedureParameterImplementor.java | 2 +- .../java/org/hibernate/query/NativeQuery.java | 1 + .../query/procedure/package-info.java | 14 ------------ ...uctAggregateEmbeddableInheritanceTest.java | 2 +- .../NestedStructEmbeddableTest.java | 2 +- .../embeddable/StructEmbeddableArrayTest.java | 2 +- .../embeddable/StructEmbeddableTest.java | 2 +- .../StructWithArrayEmbeddableTest.java | 2 +- .../procedure/DB2StoredProcedureTest.java | 2 +- .../procedure/HANAStoredProcedureTest.java | 2 +- .../procedure/MySQLStoredProcedureTest.java | 2 +- .../procedure/OracleStoredProcedureTest.java | 2 +- .../test/sql/MySQLStoredProcedureTest.java | 2 +- .../test/sql/OracleStoredProcedureTest.java | 2 +- 27 files changed, 42 insertions(+), 73 deletions(-) rename hibernate-core/src/main/java/org/hibernate/{query => }/procedure/ProcedureParameter.java (94%) rename hibernate-core/src/main/java/org/hibernate/{query/procedure => procedure/spi}/ProcedureParameterBinding.java (89%) delete mode 100644 hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterBindingImplementor.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/query/procedure/package-info.java diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java index 79c1cd72f657..18ae832287b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java @@ -141,7 +141,7 @@ public final void makeEntityManaged() { ); final EntityEntry entityEntry = persistenceContextInternal.addEntry( getInstance(), - ( getPersister().isMutable() ? Status.MANAGED : Status.READ_ONLY ), + getPersister().isMutable() ? Status.MANAGED : Status.READ_ONLY, getState(), getRowId(), getEntityKey().getIdentifier(), diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java index 2f6e63f9e0e9..c92b4850c2a9 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java @@ -164,7 +164,7 @@ private static boolean flushable(EntityEntry entry) { final Status status = entry.getStatus(); return status == Status.MANAGED || status == Status.SAVING - || status == Status.READ_ONLY; + || status == Status.READ_ONLY; // debatable, see HHH-19398 } private void cascadeOnFlush(EventSource session, EntityPersister persister, Object object, PersistContext anything) diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/FunctionReturn.java b/hibernate-core/src/main/java/org/hibernate/procedure/FunctionReturn.java index 0f0f21ff3c96..1654903a8ff4 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/FunctionReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/FunctionReturn.java @@ -5,7 +5,6 @@ package org.hibernate.procedure; import org.hibernate.Incubating; -import org.hibernate.query.procedure.ProcedureParameter; /** * Describes the function return value of a {@link ProcedureCall} diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java index bdab4e201754..987809989bfb 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java @@ -19,7 +19,6 @@ import org.hibernate.query.BindableType; import org.hibernate.query.SynchronizeableQuery; import org.hibernate.query.CommonQueryContract; -import org.hibernate.query.procedure.ProcedureParameter; /** * Defines support for executing database stored procedures and functions using the diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java index ed491d38a423..9d1128fd718d 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java @@ -4,7 +4,6 @@ */ package org.hibernate.procedure; -import org.hibernate.query.procedure.ProcedureParameter; import org.hibernate.result.Outputs; /** diff --git a/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameter.java b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureParameter.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameter.java rename to hibernate-core/src/main/java/org/hibernate/procedure/ProcedureParameter.java index a4efd3b44ea2..f29cc10acd4c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameter.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureParameter.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.procedure; +package org.hibernate.procedure; import org.hibernate.Incubating; import org.hibernate.query.QueryParameter; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java index c4a1c1e080a4..43dab7744e28 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java @@ -48,7 +48,7 @@ import org.hibernate.query.Query; import org.hibernate.query.QueryParameter; import org.hibernate.query.internal.QueryOptionsImpl; -import org.hibernate.query.procedure.ProcedureParameter; +import org.hibernate.procedure.ProcedureParameter; import org.hibernate.query.results.ResultSetMapping; import org.hibernate.query.spi.AbstractQuery; import org.hibernate.query.spi.MutableQueryOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureOutputsImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureOutputsImpl.java index 1ce0d8b65469..5a952ce4692f 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureOutputsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureOutputsImpl.java @@ -12,7 +12,7 @@ import org.hibernate.procedure.ParameterMisuseException; import org.hibernate.procedure.ProcedureOutputs; -import org.hibernate.query.procedure.ProcedureParameter; +import org.hibernate.procedure.ProcedureParameter; import org.hibernate.result.Output; import org.hibernate.result.internal.OutputsImpl; import org.hibernate.sql.exec.ExecutionException; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java index 6d84bd570ccb..7a3027b412f9 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java @@ -11,10 +11,9 @@ import org.hibernate.cache.spi.QueryKey; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.procedure.spi.ProcedureParameterBindingImplementor; +import org.hibernate.procedure.spi.ProcedureParameterBinding; import org.hibernate.procedure.spi.ProcedureParameterImplementor; import org.hibernate.query.QueryParameter; -import org.hibernate.query.procedure.ProcedureParameterBinding; import org.hibernate.query.spi.QueryParameterBinding; import org.hibernate.query.spi.QueryParameterBindings; import org.hibernate.query.spi.QueryParameterImplementor; @@ -32,7 +31,7 @@ public class ProcedureParamBindings implements QueryParameterBindings { private final ProcedureParameterMetadataImpl parameterMetadata; private final SessionFactoryImplementor sessionFactory; - private final Map, ProcedureParameterBindingImplementor> bindingMap = new HashMap<>(); + private final Map, ProcedureParameterBinding> bindingMap = new HashMap<>(); public ProcedureParamBindings( ProcedureParameterMetadataImpl parameterMetadata, @@ -57,18 +56,15 @@ public

ProcedureParameterBinding

getBinding(QueryParameterImplementor

} public

ProcedureParameterBinding

getQueryParamerBinding(ProcedureParameterImplementor

parameter) { - final ProcedureParameterImplementor

procParam = parameterMetadata.resolve( parameter ); - ProcedureParameterBindingImplementor binding = bindingMap.get( procParam ); - + final var procParam = parameterMetadata.resolve( parameter ); + var binding = bindingMap.get( procParam ); if ( binding == null ) { if ( !parameterMetadata.containsReference( parameter ) ) { throw new IllegalArgumentException( "Passed parameter is not registered with this query" ); } - binding = new ProcedureParameterBindingImpl<>( procParam, sessionFactory ); bindingMap.put( procParam, binding ); } - //noinspection unchecked return (ProcedureParameterBinding

) binding; } @@ -76,8 +72,9 @@ public

ProcedureParameterBinding

getQueryParamerBinding(ProcedureParamete @Override public

ProcedureParameterBinding

getBinding(String name) { //noinspection unchecked - final ProcedureParameterImplementor

parameter = - (ProcedureParameterImplementor

) parameterMetadata.getQueryParameter( name ); + final var parameter = + (ProcedureParameterImplementor

) + parameterMetadata.getQueryParameter( name ); if ( parameter == null ) { throw new IllegalArgumentException( "Parameter does not exist: " + name ); } @@ -87,8 +84,9 @@ public

ProcedureParameterBinding

getBinding(String name) { @Override public

ProcedureParameterBinding

getBinding(int position) { //noinspection unchecked - final ProcedureParameterImplementor

parameter = - (ProcedureParameterImplementor

) parameterMetadata.getQueryParameter( position ); + final var parameter = + (ProcedureParameterImplementor

) + parameterMetadata.getQueryParameter( position ); if ( parameter == null ) { throw new IllegalArgumentException( "Parameter at position " + position + "does not exist" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterBindingImpl.java index d45b3d2a065a..8b1cf5a39536 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterBindingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterBindingImpl.java @@ -5,10 +5,9 @@ package org.hibernate.procedure.internal; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.procedure.spi.ProcedureParameterBindingImplementor; +import org.hibernate.procedure.spi.ProcedureParameterBinding; import org.hibernate.procedure.spi.ProcedureParameterImplementor; import org.hibernate.query.internal.QueryParameterBindingImpl; -import org.hibernate.query.procedure.ProcedureParameterBinding; /** * Implementation of the {@link ProcedureParameterBinding} contract. @@ -17,7 +16,7 @@ */ public class ProcedureParameterBindingImpl extends QueryParameterBindingImpl - implements ProcedureParameterBindingImplementor { + implements ProcedureParameterBinding { public ProcedureParameterBindingImpl( ProcedureParameterImplementor queryParameter, SessionFactoryImplementor sessionFactory) { diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java index 8672e0024bd4..492c916ef89d 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java @@ -20,7 +20,7 @@ import org.hibernate.query.BindableType; import org.hibernate.query.QueryParameter; import org.hibernate.query.internal.QueryParameterBindingsImpl; -import org.hibernate.query.procedure.ProcedureParameter; +import org.hibernate.procedure.ProcedureParameter; import org.hibernate.procedure.spi.ProcedureParameterImplementor; import org.hibernate.query.spi.ProcedureParameterMetadataImplementor; import org.hibernate.query.spi.QueryParameterBindings; @@ -119,7 +119,8 @@ public int getParameterCount() { @Override public boolean containsReference(QueryParameter parameter) { - return parameters != null && parameters.contains( (ProcedureParameterImplementor) parameter ); + return parameters != null + && parameters.contains( (ProcedureParameterImplementor) parameter ); } public ParameterStrategy getParameterStrategy() { @@ -132,7 +133,7 @@ public boolean hasAnyMatching(Predicate> filter) { return false; } else { - for ( ProcedureParameterImplementor parameter : parameters ) { + for ( var parameter : parameters ) { if ( filter.test( parameter ) ) { return true; } @@ -143,7 +144,7 @@ public boolean hasAnyMatching(Predicate> filter) { @Override public ProcedureParameterImplementor findQueryParameter(String name) { - for ( ProcedureParameterImplementor parameter : parameters ) { + for ( var parameter : parameters ) { if ( name.equals( parameter.getName() ) ) { return parameter; } @@ -162,7 +163,7 @@ public ProcedureParameterImplementor getQueryParameter(String name) { @Override public ProcedureParameterImplementor findQueryParameter(int positionLabel) { - for ( ProcedureParameterImplementor parameter : parameters ) { + for ( var parameter : parameters ) { if ( parameter.getName() == null && positionLabel == parameter.getPosition() ) { return parameter; } @@ -172,7 +173,7 @@ public ProcedureParameterImplementor findQueryParameter(int positionLabel) { @Override public ProcedureParameterImplementor getQueryParameter(int positionLabel) { - final ProcedureParameterImplementor queryParameter = findQueryParameter( positionLabel ); + final var queryParameter = findQueryParameter( positionLabel ); if ( queryParameter != null ) { return queryParameter; } @@ -181,10 +182,10 @@ public ProcedureParameterImplementor getQueryParameter(int positionLabel) { @Override public

ProcedureParameterImplementor

resolve(Parameter

parameter) { - if ( parameter instanceof ProcedureParameterImplementor

procedureParameterImplementor ) { - for ( ProcedureParameterImplementor registered : parameters ) { + if ( parameter instanceof ProcedureParameterImplementor

parameterImplementor ) { + for ( var registered : parameters ) { if ( registered == parameter ) { - return procedureParameterImplementor; + return parameterImplementor; } } } @@ -210,7 +211,7 @@ public void visitRegistrations(Consumer> action) { @Override public Set getOrdinalParameterLabels() { - final HashSet labels = new HashSet<>(); + final Set labels = new HashSet<>(); visitRegistrations( parameter -> { if ( parameter.getPosition() != null ) { labels.add( parameter.getPosition() ); diff --git a/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameterBinding.java b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterBinding.java similarity index 89% rename from hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameterBinding.java rename to hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterBinding.java index b9e8f2e40c99..cbb300d54c50 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameterBinding.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterBinding.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.procedure; +package org.hibernate.procedure.spi; import org.hibernate.query.spi.QueryParameterBinding; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterBindingImplementor.java b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterBindingImplementor.java deleted file mode 100644 index 19d186b05a3b..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterBindingImplementor.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Red Hat Inc. and Hibernate Authors - */ -package org.hibernate.procedure.spi; - -import org.hibernate.query.procedure.ProcedureParameterBinding; - -/** - * @author Steve Ebersole - */ -public interface ProcedureParameterBindingImplementor extends ProcedureParameterBinding { -} diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterImplementor.java b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterImplementor.java index 35a39aeef6b6..9646d7bf868d 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterImplementor.java @@ -5,7 +5,7 @@ package org.hibernate.procedure.spi; import org.hibernate.Incubating; -import org.hibernate.query.procedure.ProcedureParameter; +import org.hibernate.procedure.ProcedureParameter; import org.hibernate.query.spi.QueryParameterImplementor; import org.hibernate.sql.exec.spi.JdbcCallParameterRegistration; diff --git a/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java b/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java index f119a6210c95..2052326502a8 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java @@ -12,6 +12,7 @@ import jakarta.persistence.Parameter; import jakarta.persistence.TemporalType; import jakarta.persistence.metamodel.SingularAttribute; + import org.hibernate.CacheMode; import org.hibernate.FlushMode; import org.hibernate.LockMode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/procedure/package-info.java b/hibernate-core/src/main/java/org/hibernate/query/procedure/package-info.java deleted file mode 100644 index 5ef9f9f717d1..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/query/procedure/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Red Hat Inc. and Hibernate Authors - */ - -/** - * Support SQL functions in the SQM model. - * - * @see org.hibernate.query.sqm.function.SqmFunctionDescriptor - */ -@Incubating -package org.hibernate.query.procedure; - -import org.hibernate.Incubating; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/StructAggregateEmbeddableInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/StructAggregateEmbeddableInheritanceTest.java index e65bc0091cd6..aebe9285500f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/StructAggregateEmbeddableInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/StructAggregateEmbeddableInheritanceTest.java @@ -21,7 +21,7 @@ import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.PostgresPlusDialect; import org.hibernate.procedure.ProcedureCall; -import org.hibernate.query.procedure.ProcedureParameter; +import org.hibernate.procedure.ProcedureParameter; import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator; import org.hibernate.testing.orm.junit.BootstrapServiceRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructEmbeddableTest.java index 51d09d543c29..32014e193fb6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructEmbeddableTest.java @@ -36,7 +36,7 @@ import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.PostgresPlusDialect; import org.hibernate.procedure.ProcedureCall; -import org.hibernate.query.procedure.ProcedureParameter; +import org.hibernate.procedure.ProcedureParameter; import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator; import org.hibernate.testing.orm.domain.gambit.EntityOfBasics; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayTest.java index aedb4c97068c..28847fee8230 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayTest.java @@ -34,7 +34,7 @@ import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.PostgresPlusDialect; import org.hibernate.procedure.ProcedureCall; -import org.hibernate.query.procedure.ProcedureParameter; +import org.hibernate.procedure.ProcedureParameter; import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator; import org.hibernate.testing.orm.domain.gambit.EntityOfBasics; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableTest.java index d62a4411e774..b2caa216381e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableTest.java @@ -35,7 +35,7 @@ import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.PostgresPlusDialect; import org.hibernate.procedure.ProcedureCall; -import org.hibernate.query.procedure.ProcedureParameter; +import org.hibernate.procedure.ProcedureParameter; import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator; import org.hibernate.testing.orm.domain.gambit.EntityOfBasics; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructWithArrayEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructWithArrayEmbeddableTest.java index 775b2dd3fda6..823c63da3dd3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructWithArrayEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructWithArrayEmbeddableTest.java @@ -34,7 +34,7 @@ import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.PostgresPlusDialect; import org.hibernate.procedure.ProcedureCall; -import org.hibernate.query.procedure.ProcedureParameter; +import org.hibernate.procedure.ProcedureParameter; import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator; import org.hibernate.testing.orm.domain.gambit.EntityOfBasics; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/DB2StoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/DB2StoredProcedureTest.java index 28912c76bce6..d4e1c04f9275 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/DB2StoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/DB2StoredProcedureTest.java @@ -17,7 +17,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.DB2Dialect; import org.hibernate.procedure.ProcedureCall; -import org.hibernate.query.procedure.ProcedureParameter; +import org.hibernate.procedure.ProcedureParameter; import org.hibernate.result.Output; import org.hibernate.result.ResultSetOutput; import org.hibernate.type.NumericBooleanConverter; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/HANAStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/HANAStoredProcedureTest.java index 674a4ecf179f..b7f96d1df2ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/HANAStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/HANAStoredProcedureTest.java @@ -22,7 +22,7 @@ import org.hibernate.dialect.HANADialect; import org.hibernate.procedure.ProcedureCall; -import org.hibernate.query.procedure.ProcedureParameter; +import org.hibernate.procedure.ProcedureParameter; import org.hibernate.result.Output; import org.hibernate.result.ResultSetOutput; import org.hibernate.type.NumericBooleanConverter; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java index 4974448faf8d..68e09cc4e0af 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java @@ -20,7 +20,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.community.dialect.TiDBDialect; import org.hibernate.procedure.ProcedureCall; -import org.hibernate.query.procedure.ProcedureParameter; +import org.hibernate.procedure.ProcedureParameter; import org.hibernate.result.Output; import org.hibernate.result.ResultSetOutput; import org.hibernate.type.StandardBasicTypes; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/OracleStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/OracleStoredProcedureTest.java index 9d18a4e56f29..33ddbdacc6a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/OracleStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/OracleStoredProcedureTest.java @@ -20,7 +20,7 @@ import org.hibernate.dialect.OracleDialect; import org.hibernate.jpa.HibernateHints; import org.hibernate.procedure.ProcedureCall; -import org.hibernate.query.procedure.ProcedureParameter; +import org.hibernate.procedure.ProcedureParameter; import org.hibernate.result.Output; import org.hibernate.result.ResultSetOutput; import org.hibernate.type.NumericBooleanConverter; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/MySQLStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/MySQLStoredProcedureTest.java index ace004e10ebd..80d2a7377a58 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/MySQLStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/MySQLStoredProcedureTest.java @@ -17,7 +17,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.community.dialect.TiDBDialect; import org.hibernate.procedure.ProcedureCall; -import org.hibernate.query.procedure.ProcedureParameter; +import org.hibernate.procedure.ProcedureParameter; import org.hibernate.result.Output; import org.hibernate.result.ResultSetOutput; import org.hibernate.testing.orm.domain.userguide.Account; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/OracleStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/OracleStoredProcedureTest.java index c116a0413e0a..c14915fe8064 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/OracleStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/OracleStoredProcedureTest.java @@ -13,7 +13,7 @@ import org.hibernate.Session; import org.hibernate.dialect.OracleDialect; import org.hibernate.procedure.ProcedureCall; -import org.hibernate.query.procedure.ProcedureParameter; +import org.hibernate.procedure.ProcedureParameter; import org.hibernate.result.Output; import org.hibernate.result.ResultSetOutput; import org.hibernate.testing.orm.domain.userguide.Account;