Skip to content

HHH-19447 move stuff out of org.hibernate.query.procedure #10132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 11, 2025
Merged

HHH-19447 move stuff out of org.hibernate.query.procedure #10132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/procedure/FunctionReturn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
1 change: 0 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*/
package org.hibernate.procedure;

import org.hibernate.query.procedure.ProcedureParameter;
import org.hibernate.result.Outputs;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...e/query/procedure/ProcedureParameter.java → ...bernate/procedure/ProcedureParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureOutputsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
22 changes: 10 additions & 12 deletions hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand All @@ -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 );
}
Expand All @@ -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" );
}
Expand Down
5 changes: 2 additions & 3 deletions ...te-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterBindingImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -17,7 +16,7 @@
*/
public class ProcedureParameterBindingImpl<T>
extends QueryParameterBindingImpl<T>
implements ProcedureParameterBindingImplementor<T> {
implements ProcedureParameterBinding<T> {
public ProcedureParameterBindingImpl(
ProcedureParameterImplementor<T> queryParameter,
SessionFactoryImplementor sessionFactory) {
Expand Down
21 changes: 11 additions & 10 deletions ...e-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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() {
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
}
}
Expand All @@ -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() );
Expand Down
2 changes: 1 addition & 1 deletion .../procedure/ProcedureParameterBinding.java → ...cedure/spi/ProcedureParameterBinding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
13 changes: 0 additions & 13 deletions ...-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterBindingImplementor.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureParameterImplementor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 0 additions & 14 deletions hibernate-core/src/main/java/org/hibernate/query/procedure/package-info.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...g/hibernate/orm/test/inheritance/embeddable/StructAggregateEmbeddableInheritanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructEmbeddableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...re/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...te-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/org/hibernate/orm/test/mapping/embeddable/StructWithArrayEmbeddableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/test/java/org/hibernate/orm/test/procedure/DB2StoredProcedureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/test/java/org/hibernate/orm/test/procedure/HANAStoredProcedureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/test/java/org/hibernate/orm/test/procedure/OracleStoredProcedureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/test/java/org/hibernate/orm/test/sql/MySQLStoredProcedureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/test/java/org/hibernate/orm/test/sql/OracleStoredProcedureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading