move stuff out of org.hibernate.query.procedure

gavinking · gavinking · commit 1b74f539ee34 · 2025-05-10T18:29:49.000+02:00
to realize consistent SPI/API split
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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<ProcedureParameterImplementor<?>, ProcedureParameterBindingImplementor<?>> bindingMap = new HashMap<>();
+	private final Map<ProcedureParameterImplementor<?>, ProcedureParameterBinding<?>> bindingMap = new HashMap<>();
 
 	public ProcedureParamBindings(
 			ProcedureParameterMetadataImpl parameterMetadata,
@@ -57,27 +56,25 @@ public <P> ProcedureParameterBinding<P> getBinding(QueryParameterImplementor<P>
 	}
 
 	public <P> ProcedureParameterBinding<P> getQueryParamerBinding(ProcedureParameterImplementor<P> parameter) {
-		final ProcedureParameterImplementor<P> 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<P>) binding;
 	}
 
 	@Override
 	public <P> ProcedureParameterBinding<P> getBinding(String name) {
 		//noinspection unchecked
-		final ProcedureParameterImplementor<P> parameter =
-				(ProcedureParameterImplementor<P>) parameterMetadata.getQueryParameter( name );
+		final var parameter =
+				(ProcedureParameterImplementor<P>)
+						parameterMetadata.getQueryParameter( name );
 		if ( parameter == null ) {
 			throw new IllegalArgumentException( "Parameter does not exist: " + name );
 		}
@@ -87,8 +84,9 @@ public <P> ProcedureParameterBinding<P> getBinding(String name) {
 	@Override
 	public <P> ProcedureParameterBinding<P> getBinding(int position) {
 		//noinspection unchecked
-		final ProcedureParameterImplementor<P> parameter =
-				(ProcedureParameterImplementor<P>) parameterMetadata.getQueryParameter( position );
+		final var parameter =
+				(ProcedureParameterImplementor<P>)
+						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
@@ -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<T>
 		extends QueryParameterBindingImpl<T>
-		implements ProcedureParameterBindingImplementor<T> {
+		implements ProcedureParameterBinding<T> {
 	public ProcedureParameterBindingImpl(
 			ProcedureParameterImplementor<T> 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
@@ -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<QueryParameterImplementor<?>> 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<QueryParameterImplementor<?>> 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 <P> ProcedureParameterImplementor<P> resolve(Parameter<P> parameter) {
-		if ( parameter instanceof ProcedureParameterImplementor<P> procedureParameterImplementor ) {
-			for ( ProcedureParameterImplementor<?> registered : parameters ) {
+		if ( parameter instanceof ProcedureParameterImplementor<P> parameterImplementor ) {
+			for ( var registered : parameters ) {
 				if ( registered == parameter ) {
-					return procedureParameterImplementor;
+					return parameterImplementor;
 				}
 			}
 		}
@@ -210,7 +211,7 @@ public void visitRegistrations(Consumer<QueryParameter<?>> action) {
 
 	@Override
 	public Set<Integer> getOrdinalParameterLabels() {
-		final HashSet<Integer> labels = new HashSet<>();
+		final Set<Integer> labels = new HashSet<>();
 		visitRegistrations( parameter -> {
 			if ( parameter.getPosition() != null ) {
 				labels.add( parameter.getPosition() );
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/spi/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
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
@@ -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
@@ -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
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ private static boolean flushable(EntityEntry entry) {`
`164`	`164`	`final Status status = entry.getStatus();`
`165`	`165`	`return status == Status.MANAGED`
`166`	`166`	`\|\| status == Status.SAVING`
`167`		`- \|\| status == Status.READ_ONLY;`
	`167`	`+ \|\| status == Status.READ_ONLY; // debatable, see HHH-19398`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`private void cascadeOnFlush(EventSource session, EntityPersister persister, Object object, PersistContext anything)`