diff --git a/gradle.properties b/gradle.properties index c402bb33b..3da2482ba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,7 +35,7 @@ org.gradle.java.installations.auto-download=false #enableMavenLocalRepo = true # The default Hibernate ORM version (override using `-PhibernateOrmVersion=the.version.you.want`) -hibernateOrmVersion = 7.0.0.CR1 +hibernateOrmVersion = 7.0.0.CR2 # Override default Hibernate ORM Gradle plugin version # Using the stable version because I don't know how to configure the build to download the snapshot version from diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveMutationQuery.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveMutationQuery.java index ce3943f25..5833156fc 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveMutationQuery.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveMutationQuery.java @@ -13,12 +13,12 @@ import java.util.concurrent.CompletionStage; import org.hibernate.FlushMode; -import org.hibernate.query.BindableType; import org.hibernate.query.CommonQueryContract; import org.hibernate.query.QueryParameter; import jakarta.persistence.Parameter; import jakarta.persistence.TemporalType; +import jakarta.persistence.metamodel.Type; /** * @see org.hibernate.query.MutationQuery @@ -33,7 +33,7 @@ public interface ReactiveMutationQuery extends CommonQueryContract {

ReactiveMutationQuery setParameter(String name, P value, Class

type); @Override -

ReactiveMutationQuery setParameter(String name, P value, BindableType

type); +

ReactiveMutationQuery setParameter(String name, P value, Type

type); @Override ReactiveMutationQuery setParameter(String name, Instant value, TemporalType temporalType); @@ -51,7 +51,7 @@ public interface ReactiveMutationQuery extends CommonQueryContract {

ReactiveMutationQuery setParameter(int position, P value, Class

type); @Override -

ReactiveMutationQuery setParameter(int position, P value, BindableType

type); +

ReactiveMutationQuery setParameter(int position, P value, Type

type); @Override ReactiveMutationQuery setParameter(int position, Instant value, TemporalType temporalType); @@ -69,7 +69,7 @@ public interface ReactiveMutationQuery extends CommonQueryContract {

ReactiveMutationQuery setParameter(QueryParameter

parameter, P value, Class

type); @Override -

ReactiveMutationQuery setParameter(QueryParameter

parameter, P val, BindableType

type); +

ReactiveMutationQuery setParameter(QueryParameter

parameter, P val, Type

type); @Override ReactiveMutationQuery setParameter(Parameter param, T value); @@ -87,7 +87,7 @@ public interface ReactiveMutationQuery extends CommonQueryContract {

ReactiveMutationQuery setParameterList(String name, Collection values, Class

javaType); @Override -

ReactiveMutationQuery setParameterList(String name, Collection values, BindableType

type); +

ReactiveMutationQuery setParameterList(String name, Collection values, Type

type); @Override ReactiveMutationQuery setParameterList(String name, Object[] values); @@ -96,7 +96,7 @@ public interface ReactiveMutationQuery extends CommonQueryContract {

ReactiveMutationQuery setParameterList(String name, P[] values, Class

javaType); @Override -

ReactiveMutationQuery setParameterList(String name, P[] values, BindableType

type); +

ReactiveMutationQuery setParameterList(String name, P[] values, Type

type); @Override ReactiveMutationQuery setParameterList(int position, Collection values); @@ -105,7 +105,7 @@ public interface ReactiveMutationQuery extends CommonQueryContract {

ReactiveMutationQuery setParameterList(int position, Collection values, Class

javaType); @Override -

ReactiveMutationQuery setParameterList(int position, Collection values, BindableType

type); +

ReactiveMutationQuery setParameterList(int position, Collection values, Type

type); @Override ReactiveMutationQuery setParameterList(int position, Object[] values); @@ -114,7 +114,7 @@ public interface ReactiveMutationQuery extends CommonQueryContract {

ReactiveMutationQuery setParameterList(int position, P[] values, Class

javaType); @Override -

ReactiveMutationQuery setParameterList(int position, P[] values, BindableType

type); +

ReactiveMutationQuery setParameterList(int position, P[] values, Type

type); @Override

ReactiveMutationQuery setParameterList(QueryParameter

parameter, Collection values); @@ -123,7 +123,7 @@ public interface ReactiveMutationQuery extends CommonQueryContract {

ReactiveMutationQuery setParameterList(QueryParameter

parameter, Collection values, Class

javaType); @Override -

ReactiveMutationQuery setParameterList(QueryParameter

parameter, Collection values, BindableType

type); +

ReactiveMutationQuery setParameterList(QueryParameter

parameter, Collection values, Type

type); @Override

ReactiveMutationQuery setParameterList(QueryParameter

parameter, P[] values); @@ -132,7 +132,7 @@ public interface ReactiveMutationQuery extends CommonQueryContract {

ReactiveMutationQuery setParameterList(QueryParameter

parameter, P[] values, Class

javaType); @Override -

ReactiveMutationQuery setParameterList(QueryParameter

parameter, P[] values, BindableType

type); +

ReactiveMutationQuery setParameterList(QueryParameter

parameter, P[] values, Type

type); @Override ReactiveMutationQuery setProperties(Object bean); diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveNativeQuery.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveNativeQuery.java index fb6a1f46d..708b6a486 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveNativeQuery.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveNativeQuery.java @@ -11,12 +11,12 @@ import java.util.Date; import java.util.Map; +import jakarta.persistence.metamodel.Type; import org.hibernate.CacheMode; import org.hibernate.FlushMode; import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.metamodel.model.domain.BasicDomainType; -import org.hibernate.query.BindableType; import org.hibernate.query.NativeQuery; import org.hibernate.query.NativeQuery.FetchReturn; import org.hibernate.query.QueryParameter; @@ -225,7 +225,7 @@ public interface ReactiveNativeQuery extends ReactiveQuery {

ReactiveNativeQuery setParameter(String name, P val, Class

type); @Override -

ReactiveNativeQuery setParameter(String name, P val, BindableType

type); +

ReactiveNativeQuery setParameter(String name, P val, Type

type); @Override ReactiveNativeQuery setParameter(String name, Instant value, TemporalType temporalType); @@ -243,7 +243,7 @@ public interface ReactiveNativeQuery extends ReactiveQuery {

ReactiveNativeQuery setParameter(int position, P val, Class

type); @Override -

ReactiveNativeQuery setParameter(int position, P val, BindableType

type); +

ReactiveNativeQuery setParameter(int position, P val, Type

type); @Override ReactiveNativeQuery setParameter(int position, Instant value, TemporalType temporalType); @@ -261,7 +261,7 @@ public interface ReactiveNativeQuery extends ReactiveQuery {

ReactiveNativeQuery setParameter(QueryParameter

parameter, P val, Class

type); @Override -

ReactiveNativeQuery setParameter(QueryParameter

parameter, P val, BindableType

type); +

ReactiveNativeQuery setParameter(QueryParameter

parameter, P val, Type

type); @Override

ReactiveNativeQuery setParameter(Parameter

param, P value); @@ -279,7 +279,7 @@ public interface ReactiveNativeQuery extends ReactiveQuery {

ReactiveNativeQuery setParameterList(String name, Collection values, Class

type); @Override -

ReactiveNativeQuery setParameterList(String name, Collection values, BindableType

type); +

ReactiveNativeQuery setParameterList(String name, Collection values, Type

type); @Override ReactiveNativeQuery setParameterList(String name, Object[] values); @@ -288,7 +288,7 @@ public interface ReactiveNativeQuery extends ReactiveQuery {

ReactiveNativeQuery setParameterList(String name, P[] values, Class

type); @Override -

ReactiveNativeQuery setParameterList(String name, P[] values, BindableType

type); +

ReactiveNativeQuery setParameterList(String name, P[] values, Type

type); @Override ReactiveNativeQuery setParameterList(int position, @SuppressWarnings("rawtypes") Collection values); @@ -297,7 +297,7 @@ public interface ReactiveNativeQuery extends ReactiveQuery {

ReactiveNativeQuery setParameterList(int position, Collection values, Class

type); @Override -

ReactiveNativeQuery setParameterList(int position, Collection values, BindableType

javaType); +

ReactiveNativeQuery setParameterList(int position, Collection values, Type

javaType); @Override ReactiveNativeQuery setParameterList(int position, Object[] values); @@ -306,7 +306,7 @@ public interface ReactiveNativeQuery extends ReactiveQuery {

ReactiveNativeQuery setParameterList(int position, P[] values, Class

javaType); @Override -

ReactiveNativeQuery setParameterList(int position, P[] values, BindableType

javaType); +

ReactiveNativeQuery setParameterList(int position, P[] values, Type

javaType); @Override

ReactiveNativeQuery setParameterList(QueryParameter

parameter, Collection values); @@ -315,7 +315,7 @@ public interface ReactiveNativeQuery extends ReactiveQuery {

ReactiveNativeQuery setParameterList(QueryParameter

parameter, Collection values, Class

javaType); @Override -

ReactiveNativeQuery setParameterList(QueryParameter

parameter, Collection values, BindableType

type); +

ReactiveNativeQuery setParameterList(QueryParameter

parameter, Collection values, Type

type); @Override

ReactiveNativeQuery setParameterList(QueryParameter

parameter, P[] values); @@ -324,7 +324,7 @@ public interface ReactiveNativeQuery extends ReactiveQuery {

ReactiveNativeQuery setParameterList(QueryParameter

parameter, P[] values, Class

javaType); @Override -

ReactiveNativeQuery setParameterList(QueryParameter

parameter, P[] values, BindableType

type); +

ReactiveNativeQuery setParameterList(QueryParameter

parameter, P[] values, Type

type); @Override ReactiveNativeQuery setProperties(Object bean); diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveQuery.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveQuery.java index 0dae454e0..424db8b35 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveQuery.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveQuery.java @@ -11,11 +11,11 @@ import java.util.Date; import java.util.Map; +import jakarta.persistence.metamodel.Type; import org.hibernate.CacheMode; import org.hibernate.FlushMode; import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.query.BindableType; import org.hibernate.query.ParameterMetadata; import org.hibernate.query.QueryParameter; import org.hibernate.query.ResultListTransformer; @@ -64,7 +64,7 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut

ReactiveQuery setParameter(String parameter, P argument, Class

type); @Override -

ReactiveQuery setParameter(String parameter, P argument, BindableType

type); +

ReactiveQuery setParameter(String parameter, P argument, Type

type); /** * Bind an {@link Instant} value to the named query parameter using @@ -85,26 +85,26 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut * which it occurs, use one of the forms which accepts a "type". * * @see #setParameter(int, Object, Class) - * @see #setParameter(int, Object, BindableType) + * @see #setParameter(int, Object, Type) */ @Override ReactiveQuery setParameter(int parameter, Object argument); /** * Bind the given argument to an ordinal query parameter using the given - * Class reference to attempt to determine the {@link BindableType} - * to use. If unable to determine an appropriate {@link BindableType}, + * Class reference to attempt to determine the {@link Type} + * to use. If unable to determine an appropriate {@link Type}, * {@link #setParameter(int, Object)} is used. * - * @see #setParameter(int, Object, BindableType) + * @see #setParameter(int, Object, Type) */

ReactiveQuery setParameter(int parameter, P argument, Class

type); /** * Bind the given argument to an ordinal query parameter using the given - * {@link BindableType}. + * {@link Type}. */ -

ReactiveQuery setParameter(int parameter, P argument, BindableType

type); +

ReactiveQuery setParameter(int parameter, P argument, Type

type); /** * Bind an {@link Instant} value to the ordinal query parameter using @@ -128,7 +128,7 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut

ReactiveQuery setParameter(QueryParameter

parameter, P argument, Class

type); -

ReactiveQuery setParameter(QueryParameter

parameter, P argument, BindableType

type); +

ReactiveQuery setParameter(QueryParameter

parameter, P argument, Type

type); @Override ReactiveQuery setParameter(Parameter parameter, T argument); @@ -145,14 +145,14 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut /** * Bind multiple arguments to a named query parameter using the given - * {@link BindableType}. + * {@link Type}. * * @apiNote This is used for binding a list of values to an expression * such as {@code entity.field in (:values)}. * * @return {@code this}, for method chaining */ -

ReactiveQuery setParameterList(String parameter, Collection arguments, BindableType

type); +

ReactiveQuery setParameterList(String parameter, Collection arguments, Type

type); /** * Bind multiple arguments to a named query parameter. @@ -169,11 +169,11 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut /** * Bind multiple arguments to a named query parameter using the given - * Class reference to attempt to determine the {@link BindableType} - * to use. If unable to determine an appropriate {@link BindableType}, + * Class reference to attempt to determine the {@link Type} + * to use. If unable to determine an appropriate {@link Type}, * {@link #setParameterList(String, Collection)} is used. * - * @see #setParameterList(java.lang.String, Object[], BindableType) + * @see #setParameterList(java.lang.String, Object[], Type) * * @apiNote This is used for binding a list of values to an expression * such as {@code entity.field in (:values)}. @@ -185,14 +185,14 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut /** * Bind multiple arguments to a named query parameter using the given - * {@link BindableType}. + * {@link Type}. * * @apiNote This is used for binding a list of values to an expression * such as {@code entity.field in (:values)}. * * @return {@code this}, for method chaining */ -

ReactiveQuery setParameterList(String parameter, P[] arguments, BindableType

type); +

ReactiveQuery setParameterList(String parameter, P[] arguments, Type

type); /** * Bind multiple arguments to an ordinal query parameter. @@ -209,11 +209,11 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut /** * Bind multiple arguments to an ordinal query parameter using the given - * Class reference to attempt to determine the {@link BindableType} - * to use. If unable to determine an appropriate {@link BindableType}, + * Class reference to attempt to determine the {@link Type} + * to use. If unable to determine an appropriate {@link Type}, * {@link #setParameterList(String, Collection)} is used. * - * @see #setParameterList(int, Collection, BindableType) + * @see #setParameterList(int, Collection, Type) * * @apiNote This is used for binding a list of values to an expression * such as {@code entity.field in (:values)}. @@ -224,14 +224,14 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut /** * Bind multiple arguments to an ordinal query parameter using the given - * {@link BindableType}. + * {@link Type}. * * @apiNote This is used for binding a list of values to an expression * such as {@code entity.field in (:values)}. * * @return {@code this}, for method chaining */ -

ReactiveQuery setParameterList(int parameter, Collection arguments, BindableType

type); +

ReactiveQuery setParameterList(int parameter, Collection arguments, Type

type); /** * Bind multiple arguments to an ordinal query parameter. @@ -248,11 +248,11 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut /** * Bind multiple arguments to an ordinal query parameter using the given - * {@link Class} reference to attempt to determine the {@link BindableType} - * to use. If unable to determine an appropriate {@link BindableType}, + * {@link Class} reference to attempt to determine the {@link Type} + * to use. If unable to determine an appropriate {@link Type}, * {@link #setParameterList(String, Collection)} is used. * - * @see #setParameterList(int, Object[], BindableType) + * @see #setParameterList(int, Object[], Type) * * @apiNote This is used for binding a list of values to an expression * such as {@code entity.field in (:values)}. @@ -263,14 +263,14 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut /** * Bind multiple arguments to an ordinal query parameter using the given - * {@link BindableType}. + * {@link Type}. * * @apiNote This is used for binding a list of values to an expression * such as {@code entity.field in (:values)}. * * @return {@code this}, for method chaining */ -

ReactiveQuery setParameterList(int parameter, P[] arguments, BindableType

type); +

ReactiveQuery setParameterList(int parameter, P[] arguments, Type

type); /** * Bind multiple arguments to the query parameter represented by the given @@ -289,11 +289,11 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut /** * Bind multiple arguments to the query parameter represented by the given * {@link QueryParameter} using the given Class reference to attempt to - * determine the {@link BindableType} to use. If unable to determine an - * appropriate {@link BindableType}, {@link #setParameterList(String, Collection)} + * determine the {@link Type} to use. If unable to determine an + * appropriate {@link Type}, {@link #setParameterList(String, Collection)} * is used. * - * @see #setParameterList(QueryParameter, java.util.Collection, BindableType) + * @see #setParameterList(QueryParameter, java.util.Collection, Type) * * @apiNote This is used for binding a list of values to an expression such * as {@code entity.field in (:values)}. @@ -304,7 +304,7 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut /** * Bind multiple arguments to the query parameter represented by the given - * {@link QueryParameter}, inferring the {@link BindableType}. + * {@link QueryParameter}, inferring the {@link Type}. *

* The "type mapping" for the binding is inferred from the type of the first * collection element. @@ -314,7 +314,7 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut * * @return {@code this}, for method chaining */ -

ReactiveQuery setParameterList(QueryParameter

parameter, Collection arguments, BindableType

type); +

ReactiveQuery setParameterList(QueryParameter

parameter, Collection arguments, Type

type); /** * Bind multiple arguments to the query parameter represented by the @@ -334,11 +334,11 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut /** * Bind multiple arguments to the query parameter represented by the * given {@link QueryParameter} using the given Class reference to attempt - * to determine the {@link BindableType} to use. If unable to - * determine an appropriate {@link BindableType}, + * to determine the {@link Type} to use. If unable to + * determine an appropriate {@link Type}, * {@link #setParameterList(String, Collection)} is used * - * @see #setParameterList(QueryParameter, Object[], BindableType) + * @see #setParameterList(QueryParameter, Object[], Type) * * @apiNote This is used for binding a list of values to an expression such * as {@code entity.field in (:values)}. @@ -349,7 +349,7 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut /** * Bind multiple arguments to the query parameter represented by the - * given {@link QueryParameter}, inferring the {@link BindableType}. + * given {@link QueryParameter}, inferring the {@link Type}. *

* The "type mapping" for the binding is inferred from the type of * the first collection element @@ -359,7 +359,7 @@ public interface ReactiveQuery extends ReactiveSelectionQuery, ReactiveMut * * @return {@code this}, for method chaining */ -

ReactiveQuery setParameterList(QueryParameter

parameter, P[] arguments, BindableType

type); +

ReactiveQuery setParameterList(QueryParameter

parameter, P[] arguments, Type

type); /** * Bind the property values of the given bean to named parameters of the query, diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveQueryImplementor.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveQueryImplementor.java index 0354a59e5..6d28fbb04 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveQueryImplementor.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveQueryImplementor.java @@ -11,7 +11,6 @@ import java.util.Date; import java.util.Map; -import org.hibernate.query.BindableType; import org.hibernate.query.QueryParameter; import org.hibernate.query.ResultListTransformer; import org.hibernate.query.TupleTransformer; @@ -19,6 +18,7 @@ import jakarta.persistence.Parameter; import jakarta.persistence.TemporalType; +import jakarta.persistence.metamodel.Type; public interface ReactiveQueryImplementor extends ReactiveQuery { @@ -37,7 +37,7 @@ public interface ReactiveQueryImplementor extends ReactiveQuery {

ReactiveQueryImplementor setParameter(String name, P value, Class

type); @Override -

ReactiveQueryImplementor setParameter(String name, P value, BindableType

type); +

ReactiveQueryImplementor setParameter(String name, P value, Type

type); @Override ReactiveQueryImplementor setParameter(String name, Instant value, TemporalType temporalType); @@ -55,7 +55,7 @@ public interface ReactiveQueryImplementor extends ReactiveQuery {

ReactiveQueryImplementor setParameter(int position, P value, Class

type); @Override -

ReactiveQueryImplementor setParameter(int position, P value, BindableType

type); +

ReactiveQueryImplementor setParameter(int position, P value, Type

type); @Override ReactiveQueryImplementor setParameter(int position, Instant value, TemporalType temporalType); @@ -73,7 +73,7 @@ public interface ReactiveQueryImplementor extends ReactiveQuery {

ReactiveQueryImplementor setParameter(QueryParameter

parameter, P value, Class

type); @Override -

ReactiveQueryImplementor setParameter(QueryParameter

parameter, P val, BindableType

type); +

ReactiveQueryImplementor setParameter(QueryParameter

parameter, P val, Type

type); @Override ReactiveQueryImplementor setParameter(Parameter param, T value); @@ -91,7 +91,7 @@ public interface ReactiveQueryImplementor extends ReactiveQuery {

ReactiveQueryImplementor setParameterList(String name, Collection values, Class

javaType); @Override -

ReactiveQueryImplementor setParameterList(String name, Collection values, BindableType

type); +

ReactiveQueryImplementor setParameterList(String name, Collection values, Type

type); @Override ReactiveQueryImplementor setParameterList(String name, Object[] values); @@ -100,7 +100,7 @@ public interface ReactiveQueryImplementor extends ReactiveQuery {

ReactiveQueryImplementor setParameterList(String name, P[] values, Class

javaType); @Override -

ReactiveQueryImplementor setParameterList(String name, P[] values, BindableType

type); +

ReactiveQueryImplementor setParameterList(String name, P[] values, Type

type); @Override ReactiveQueryImplementor setParameterList(int position, @SuppressWarnings("rawtypes") Collection values); @@ -112,7 +112,7 @@ public interface ReactiveQueryImplementor extends ReactiveQuery {

ReactiveQueryImplementor setParameterList( int position, Collection values, - BindableType

type); + Type

type); @Override ReactiveQueryImplementor setParameterList(int position, Object[] values); @@ -121,7 +121,7 @@

ReactiveQueryImplementor setParameterList(

ReactiveQueryImplementor setParameterList(int position, P[] values, Class

javaType); @Override -

ReactiveQueryImplementor setParameterList(int position, P[] values, BindableType

type); +

ReactiveQueryImplementor setParameterList(int position, P[] values, Type

type); @Override

ReactiveQueryImplementor setParameterList(QueryParameter

parameter, Collection values); @@ -136,7 +136,7 @@

ReactiveQueryImplementor setParameterList(

ReactiveQueryImplementor setParameterList( QueryParameter

parameter, Collection values, - BindableType

type); + Type

type); @Override

ReactiveQueryImplementor setParameterList(QueryParameter

parameter, P[] values); @@ -145,7 +145,7 @@

ReactiveQueryImplementor setParameterList(

ReactiveQueryImplementor setParameterList(QueryParameter

parameter, P[] values, Class

javaType); @Override -

ReactiveQueryImplementor setParameterList(QueryParameter

parameter, P[] values, BindableType

type); +

ReactiveQueryImplementor setParameterList(QueryParameter

parameter, P[] values, Type

type); @Override ReactiveQueryImplementor setProperties(Object bean); diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveSelectionQuery.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveSelectionQuery.java index 2ee7a051e..4fe138bca 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveSelectionQuery.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveSelectionQuery.java @@ -5,13 +5,13 @@ */ package org.hibernate.reactive.query; +import jakarta.persistence.metamodel.Type; import org.hibernate.CacheMode; import org.hibernate.FlushMode; import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.graph.GraphSemantic; import org.hibernate.graph.spi.RootGraphImplementor; -import org.hibernate.query.BindableType; import org.hibernate.query.CommonQueryContract; import org.hibernate.query.QueryParameter; @@ -130,7 +130,7 @@ default CompletionStage> getReactiveResultList() {

ReactiveSelectionQuery setParameter(String name, P value, Class

type); @Override -

ReactiveSelectionQuery setParameter(String name, P value, BindableType

type); +

ReactiveSelectionQuery setParameter(String name, P value, Type

type); @Override ReactiveSelectionQuery setParameter(String name, Instant value, TemporalType temporalType); @@ -148,7 +148,7 @@ default CompletionStage> getReactiveResultList() {

ReactiveSelectionQuery setParameter(int position, P value, Class

type); @Override -

ReactiveSelectionQuery setParameter(int position, P value, BindableType

type); +

ReactiveSelectionQuery setParameter(int position, P value, Type

type); @Override ReactiveSelectionQuery setParameter(int position, Instant value, TemporalType temporalType); @@ -166,7 +166,7 @@ default CompletionStage> getReactiveResultList() {

ReactiveSelectionQuery setParameter(QueryParameter

parameter, P value, Class

type); @Override -

ReactiveSelectionQuery setParameter(QueryParameter

parameter, P val, BindableType

type); +

ReactiveSelectionQuery setParameter(QueryParameter

parameter, P val, Type

type); @Override ReactiveSelectionQuery setParameter(Parameter param, T value); @@ -184,7 +184,7 @@ default CompletionStage> getReactiveResultList() {

ReactiveSelectionQuery setParameterList(String name, Collection values, Class

javaType); @Override -

ReactiveSelectionQuery setParameterList(String name, Collection values, BindableType

type); +

ReactiveSelectionQuery setParameterList(String name, Collection values, Type

type); @Override ReactiveSelectionQuery setParameterList(String name, Object[] values); @@ -193,7 +193,7 @@ default CompletionStage> getReactiveResultList() {

ReactiveSelectionQuery setParameterList(String name, P[] values, Class

javaType); @Override -

ReactiveSelectionQuery setParameterList(String name, P[] values, BindableType

type); +

ReactiveSelectionQuery setParameterList(String name, P[] values, Type

type); @Override ReactiveSelectionQuery setParameterList(int position, @SuppressWarnings("rawtypes") Collection values); @@ -202,7 +202,7 @@ default CompletionStage> getReactiveResultList() {

ReactiveSelectionQuery setParameterList(int position, Collection values, Class

javaType); @Override -

ReactiveSelectionQuery setParameterList(int position, Collection values, BindableType

type); +

ReactiveSelectionQuery setParameterList(int position, Collection values, Type

type); @Override ReactiveSelectionQuery setParameterList(int position, Object[] values); @@ -211,7 +211,7 @@ default CompletionStage> getReactiveResultList() {

ReactiveSelectionQuery setParameterList(int position, P[] values, Class

javaType); @Override -

ReactiveSelectionQuery setParameterList(int position, P[] values, BindableType

type); +

ReactiveSelectionQuery setParameterList(int position, P[] values, Type

type); @Override

ReactiveSelectionQuery setParameterList(QueryParameter

parameter, Collection values); @@ -220,7 +220,7 @@ default CompletionStage> getReactiveResultList() {

ReactiveSelectionQuery setParameterList(QueryParameter

parameter, Collection values, Class

javaType); @Override -

ReactiveSelectionQuery setParameterList(QueryParameter

parameter, Collection values, BindableType

type); +

ReactiveSelectionQuery setParameterList(QueryParameter

parameter, Collection values, Type

type); @Override

ReactiveSelectionQuery setParameterList(QueryParameter

parameter, P[] values); @@ -229,7 +229,7 @@ default CompletionStage> getReactiveResultList() {

ReactiveSelectionQuery setParameterList(QueryParameter

parameter, P[] values, Class

javaType); @Override -

ReactiveSelectionQuery setParameterList(QueryParameter

parameter, P[] values, BindableType

type); +

ReactiveSelectionQuery setParameterList(QueryParameter

parameter, P[] values, Type

type); @Override ReactiveSelectionQuery setProperties(Object bean); 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 afaf43e41..6ca5b2024 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 @@ -27,7 +27,6 @@ import org.hibernate.graph.RootGraph; import org.hibernate.graph.spi.RootGraphImplementor; import org.hibernate.metamodel.model.domain.BasicDomainType; -import org.hibernate.query.BindableType; import org.hibernate.query.QueryParameter; import org.hibernate.query.ResultListTransformer; import org.hibernate.query.TupleTransformer; @@ -54,6 +53,7 @@ import jakarta.persistence.LockModeType; import jakarta.persistence.Parameter; import jakarta.persistence.TemporalType; +import jakarta.persistence.metamodel.Type; import jakarta.persistence.metamodel.SingularAttribute; public class ReactiveNativeQueryImpl extends NativeQueryImpl @@ -570,7 +570,7 @@ public ReactiveNativeQueryImpl setParameter(String name, Object val) { } @Override - public

ReactiveNativeQueryImpl setParameter(String name, P val, BindableType

type) { + public

ReactiveNativeQueryImpl setParameter(String name, P val, Type

type) { super.setParameter( name, val, type ); return this; } @@ -612,7 +612,7 @@ public

ReactiveNativeQueryImpl setParameter(int position, P val, Class

} @Override - public

ReactiveNativeQueryImpl setParameter(int position, P val, BindableType

type) { + public

ReactiveNativeQueryImpl setParameter(int position, P val, Type

type) { super.setParameter( position, val, type ); return this; } @@ -648,7 +648,7 @@ public

ReactiveNativeQueryImpl setParameter(QueryParameter

parameter, } @Override - public

ReactiveNativeQueryImpl setParameter(QueryParameter

parameter, P val, BindableType

type) { + public

ReactiveNativeQueryImpl setParameter(QueryParameter

parameter, P val, Type

type) { super.setParameter( parameter, val, type ); return this; } @@ -690,7 +690,7 @@ public

ReactiveNativeQueryImpl setParameterList(String name, Collection ReactiveNativeQueryImpl setParameterList( String name, Collection values, - BindableType

type) { + Type

type) { super.setParameterList( name, values, type ); return this; } @@ -708,7 +708,7 @@ public

ReactiveNativeQueryImpl setParameterList(String name, P[] values, } @Override - public

ReactiveNativeQueryImpl setParameterList(String name, P[] values, BindableType

type) { + public

ReactiveNativeQueryImpl setParameterList(String name, P[] values, Type

type) { super.setParameterList( name, values, type ); return this; } @@ -732,7 +732,7 @@ public

ReactiveNativeQueryImpl setParameterList( public

ReactiveNativeQueryImpl setParameterList( int position, Collection values, - BindableType

type) { + Type

type) { super.setParameterList( position, values, type ); return this; } @@ -750,7 +750,7 @@ public

ReactiveNativeQueryImpl setParameterList(int position, P[] values, } @Override - public

ReactiveNativeQueryImpl setParameterList(int position, P[] values, BindableType

type) { + public

ReactiveNativeQueryImpl setParameterList(int position, P[] values, Type

type) { super.setParameterList( position, values, type ); return this; } @@ -776,7 +776,7 @@ public

ReactiveNativeQueryImpl setParameterList( public

ReactiveNativeQueryImpl setParameterList( QueryParameter

parameter, Collection values, - BindableType

type) { + Type

type) { super.setParameterList( parameter, values, type ); return this; } @@ -797,7 +797,7 @@ public

ReactiveNativeQueryImpl setParameterList(QueryParameter

paramet public

ReactiveNativeQueryImpl setParameterList( QueryParameter

parameter, P[] values, - BindableType

type) { + Type

type) { super.setParameterList( parameter, values, type ); return this; } diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/spi/ReactiveNativeQueryImplementor.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/spi/ReactiveNativeQueryImplementor.java index 3c59afc3e..fd9ca555f 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/spi/ReactiveNativeQueryImplementor.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/spi/ReactiveNativeQueryImplementor.java @@ -11,12 +11,12 @@ import java.util.Date; import java.util.Map; +import jakarta.persistence.metamodel.Type; import org.hibernate.CacheMode; import org.hibernate.FlushMode; import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.metamodel.model.domain.BasicDomainType; -import org.hibernate.query.BindableType; import org.hibernate.query.QueryParameter; import org.hibernate.query.ResultListTransformer; import org.hibernate.query.TupleTransformer; @@ -173,7 +173,7 @@ ReactiveNativeQueryImplementor addJoin( ReactiveNativeQueryImplementor setParameter(String name, Object val); @Override -

ReactiveNativeQueryImplementor setParameter(String name, P val, BindableType

type); +

ReactiveNativeQueryImplementor setParameter(String name, P val, Type

type); @Override

ReactiveNativeQueryImplementor setParameter(String name, P val, Class

type); @@ -194,7 +194,7 @@ ReactiveNativeQueryImplementor addJoin(

ReactiveNativeQueryImplementor setParameter(int position, P val, Class

type); @Override -

ReactiveNativeQueryImplementor setParameter(int position, P val, BindableType

type); +

ReactiveNativeQueryImplementor setParameter(int position, P val, Type

type); @Override ReactiveNativeQueryImplementor setParameter(int position, Instant value, TemporalType temporalType); @@ -212,7 +212,7 @@ ReactiveNativeQueryImplementor addJoin(

ReactiveNativeQueryImplementor setParameter(QueryParameter

parameter, P val, Class

type); @Override -

ReactiveNativeQueryImplementor setParameter(QueryParameter

parameter, P val, BindableType

type); +

ReactiveNativeQueryImplementor setParameter(QueryParameter

parameter, P val, Type

type); @Override

ReactiveNativeQueryImplementor setParameter(Parameter

param, P value); @@ -230,7 +230,7 @@ ReactiveNativeQueryImplementor addJoin(

ReactiveNativeQueryImplementor setParameterList(String name, Collection values, Class

type); @Override -

ReactiveNativeQueryImplementor setParameterList(String name, Collection values, BindableType

type); +

ReactiveNativeQueryImplementor setParameterList(String name, Collection values, Type

type); @Override ReactiveNativeQueryImplementor setParameterList(String name, Object[] values); @@ -239,7 +239,7 @@ ReactiveNativeQueryImplementor addJoin(

ReactiveNativeQueryImplementor setParameterList(String name, P[] values, Class

type); @Override -

ReactiveNativeQueryImplementor setParameterList(String name, P[] values, BindableType

type); +

ReactiveNativeQueryImplementor setParameterList(String name, P[] values, Type

type); @Override ReactiveNativeQueryImplementor setParameterList(int position, @SuppressWarnings("rawtypes") Collection values); @@ -248,7 +248,7 @@ ReactiveNativeQueryImplementor addJoin(

ReactiveNativeQueryImplementor setParameterList(int position, Collection values, Class

type); @Override -

ReactiveNativeQueryImplementor setParameterList(int position, Collection values, BindableType

type); +

ReactiveNativeQueryImplementor setParameterList(int position, Collection values, Type

type); @Override ReactiveNativeQueryImplementor setParameterList(int position, Object[] values); @@ -257,7 +257,7 @@ ReactiveNativeQueryImplementor addJoin(

ReactiveNativeQueryImplementor setParameterList(int position, P[] values, Class

javaType); @Override -

ReactiveNativeQueryImplementor setParameterList(int position, P[] values, BindableType

type); +

ReactiveNativeQueryImplementor setParameterList(int position, P[] values, Type

type); @Override @@ -267,7 +267,7 @@ ReactiveNativeQueryImplementor addJoin(

ReactiveNativeQueryImplementor setParameterList(QueryParameter

parameter, Collection values, Class

javaType); @Override -

ReactiveNativeQueryImplementor setParameterList(QueryParameter

parameter, Collection values, BindableType

type); +

ReactiveNativeQueryImplementor setParameterList(QueryParameter

parameter, Collection values, Type

type); @Override

ReactiveNativeQueryImplementor setParameterList(QueryParameter

parameter, P[] values); @@ -276,7 +276,7 @@ ReactiveNativeQueryImplementor addJoin(

ReactiveNativeQueryImplementor setParameterList(QueryParameter

parameter, P[] values, Class

javaType); @Override -

ReactiveNativeQueryImplementor setParameterList(QueryParameter

parameter, P[] values, BindableType

type); +

ReactiveNativeQueryImplementor setParameterList(QueryParameter

parameter, P[] values, Type

type); @Override ReactiveNativeQueryImplementor setProperties(Object bean); diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/ReactiveSqmSelectionQuery.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/ReactiveSqmSelectionQuery.java index 92d00b305..0794ae435 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/ReactiveSqmSelectionQuery.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/ReactiveSqmSelectionQuery.java @@ -13,13 +13,13 @@ import org.hibernate.CacheMode; import org.hibernate.FlushMode; -import org.hibernate.query.BindableType; import org.hibernate.query.QueryParameter; import org.hibernate.query.spi.SqmQuery; import org.hibernate.reactive.query.ReactiveSelectionQuery; import jakarta.persistence.Parameter; import jakarta.persistence.TemporalType; +import jakarta.persistence.metamodel.Type; /** * @see org.hibernate.query.sqm.SqmSelectionQuery @@ -33,7 +33,7 @@ public interface ReactiveSqmSelectionQuery extends ReactiveSelectionQuery,

ReactiveSqmSelectionQuery setParameter(String name, P value, Class

type); @Override -

ReactiveSqmSelectionQuery setParameter(String name, P value, BindableType

type); +

ReactiveSqmSelectionQuery setParameter(String name, P value, Type

type); @Override ReactiveSqmSelectionQuery setParameter(String name, Instant value, TemporalType temporalType); @@ -51,7 +51,7 @@ public interface ReactiveSqmSelectionQuery extends ReactiveSelectionQuery,

ReactiveSqmSelectionQuery setParameter(int position, P value, Class

type); @Override -

ReactiveSqmSelectionQuery setParameter(int position, P value, BindableType

type); +

ReactiveSqmSelectionQuery setParameter(int position, P value, Type

type); @Override ReactiveSqmSelectionQuery setParameter(int position, Instant value, TemporalType temporalType); @@ -69,7 +69,7 @@ public interface ReactiveSqmSelectionQuery extends ReactiveSelectionQuery,

ReactiveSqmSelectionQuery setParameter(QueryParameter

parameter, P value, Class

type); @Override -

ReactiveSqmSelectionQuery setParameter(QueryParameter

parameter, P val, BindableType

type); +

ReactiveSqmSelectionQuery setParameter(QueryParameter

parameter, P val, Type

type); @Override ReactiveSqmSelectionQuery setParameter(Parameter param, T value); @@ -90,7 +90,7 @@ public interface ReactiveSqmSelectionQuery extends ReactiveSelectionQuery,

ReactiveSqmSelectionQuery setParameterList( String name, Collection values, - BindableType

type); + Type

type); @Override ReactiveSqmSelectionQuery setParameterList(String name, Object[] values); @@ -99,7 +99,7 @@

ReactiveSqmSelectionQuery setParameterList(

ReactiveSqmSelectionQuery setParameterList(String name, P[] values, Class

javaType); @Override -

ReactiveSqmSelectionQuery setParameterList(String name, P[] values, BindableType

type); +

ReactiveSqmSelectionQuery setParameterList(String name, P[] values, Type

type); @Override ReactiveSqmSelectionQuery setParameterList(int position, Collection values); @@ -111,7 +111,7 @@

ReactiveSqmSelectionQuery setParameterList(

ReactiveSqmSelectionQuery setParameterList( int position, Collection values, - BindableType

type); + Type

type); @Override ReactiveSqmSelectionQuery setParameterList(int position, Object[] values); @@ -120,7 +120,7 @@

ReactiveSqmSelectionQuery setParameterList(

ReactiveSqmSelectionQuery setParameterList(int position, P[] values, Class

javaType); @Override -

ReactiveSqmSelectionQuery setParameterList(int position, P[] values, BindableType

type); +

ReactiveSqmSelectionQuery setParameterList(int position, P[] values, Type

type); @Override

ReactiveSqmSelectionQuery setParameterList(QueryParameter

parameter, Collection values); @@ -135,7 +135,7 @@

ReactiveSqmSelectionQuery setParameterList(

ReactiveSqmSelectionQuery setParameterList( QueryParameter

parameter, Collection values, - BindableType

type); + Type

type); @Override

ReactiveSqmSelectionQuery setParameterList(QueryParameter

parameter, P[] values); @@ -144,7 +144,7 @@

ReactiveSqmSelectionQuery setParameterList(

ReactiveSqmSelectionQuery setParameterList(QueryParameter

parameter, P[] values, Class

javaType); @Override -

ReactiveSqmSelectionQuery setParameterList(QueryParameter

parameter, P[] values, BindableType

type); +

ReactiveSqmSelectionQuery setParameterList(QueryParameter

parameter, P[] values, Type

type); @Override ReactiveSqmSelectionQuery setProperties(Object bean); diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveQuerySqmImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveQuerySqmImpl.java index 61f0d39c6..5242ab747 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveQuerySqmImpl.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveQuerySqmImpl.java @@ -32,7 +32,6 @@ import org.hibernate.id.enhanced.Optimizer; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.query.BindableType; import org.hibernate.query.IllegalQueryOperationException; import org.hibernate.query.QueryParameter; import org.hibernate.query.ResultListTransformer; @@ -69,6 +68,7 @@ import jakarta.persistence.LockModeType; import jakarta.persistence.Parameter; import jakarta.persistence.TemporalType; +import jakarta.persistence.metamodel.Type; /** * A reactive {@link QuerySqmImpl} @@ -629,7 +629,7 @@ public

ReactiveQuerySqmImpl setParameter(String name, P value, Class

j } @Override - public

ReactiveQuerySqmImpl setParameter(String name, P value, BindableType

type) { + public

ReactiveQuerySqmImpl setParameter(String name, P value, Type

type) { super.setParameter( name, value, type ); return this; } @@ -653,7 +653,7 @@ public

ReactiveQuerySqmImpl setParameter(int position, P value, Class

} @Override - public

ReactiveQuerySqmImpl setParameter(int position, P value, BindableType

type) { + public

ReactiveQuerySqmImpl setParameter(int position, P value, Type

type) { super.setParameter( position, value, type ); return this; } @@ -677,7 +677,7 @@ public

ReactiveQuerySqmImpl setParameter(QueryParameter

parameter, P v } @Override - public

ReactiveQuerySqmImpl setParameter(QueryParameter

parameter, P value, BindableType

type) { + public

ReactiveQuerySqmImpl setParameter(QueryParameter

parameter, P value, Type

type) { super.setParameter( parameter, value, type ); return this; } @@ -737,7 +737,7 @@ public

ReactiveQuerySqmImpl setParameterList(String name, Collection ReactiveQuerySqmImpl setParameterList(String name, Collection values, BindableType

type) { + public

ReactiveQuerySqmImpl setParameterList(String name, Collection values, Type

type) { super.setParameterList( name, values, type ); return this; } @@ -755,7 +755,7 @@ public

ReactiveQuerySqmImpl setParameterList(String name, P[] values, Cla } @Override - public

ReactiveQuerySqmImpl setParameterList(String name, P[] values, BindableType

type) { + public

ReactiveQuerySqmImpl setParameterList(String name, P[] values, Type

type) { super.setParameterList( name, values, type ); return this; } @@ -773,7 +773,7 @@ public

ReactiveQuerySqmImpl setParameterList(int position, Collection ReactiveQuerySqmImpl setParameterList(int position, Collection values, BindableType

type) { + public

ReactiveQuerySqmImpl setParameterList(int position, Collection values, Type

type) { super.setParameterList( position, values, type ); return this; } @@ -791,7 +791,7 @@ public

ReactiveQuerySqmImpl setParameterList(int position, P[] values, Cl } @Override - public

ReactiveQuerySqmImpl setParameterList(int position, P[] values, BindableType

type) { + public

ReactiveQuerySqmImpl setParameterList(int position, P[] values, Type

type) { super.setParameterList( position, values, type ); return this; } @@ -809,7 +809,7 @@ public

ReactiveQuerySqmImpl setParameterList(QueryParameter

parameter, } @Override - public

ReactiveQuerySqmImpl setParameterList(QueryParameter

parameter, Collection values, BindableType

type) { + public

ReactiveQuerySqmImpl setParameterList(QueryParameter

parameter, Collection values, Type

type) { super.setParameterList( parameter, values, type ); return this; } @@ -827,7 +827,7 @@ public

ReactiveQuerySqmImpl setParameterList(QueryParameter

parameter, } @Override - public

ReactiveQuerySqmImpl setParameterList(QueryParameter

parameter, P[] values, BindableType

type) { + public

ReactiveQuerySqmImpl setParameterList(QueryParameter

parameter, P[] values, Type

type) { super.setParameterList( parameter, values, type ); return this; } diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSqmSelectionQueryImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSqmSelectionQueryImpl.java index 9249b0544..26d6dadfe 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSqmSelectionQueryImpl.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/internal/ReactiveSqmSelectionQueryImpl.java @@ -14,7 +14,6 @@ import org.hibernate.graph.GraphSemantic; import org.hibernate.graph.spi.RootGraphImplementor; import org.hibernate.internal.util.collections.IdentitySet; -import org.hibernate.query.BindableType; import org.hibernate.query.QueryLogging; import org.hibernate.query.QueryParameter; import org.hibernate.query.internal.DelegatingDomainQueryExecutionContext; @@ -35,6 +34,8 @@ import jakarta.persistence.LockModeType; import jakarta.persistence.Parameter; import jakarta.persistence.TemporalType; +import jakarta.persistence.metamodel.Type; + import java.time.Instant; import java.util.ArrayList; import java.util.Calendar; @@ -342,7 +343,7 @@ public

ReactiveSqmSelectionQueryImpl setParameter(String name, P value, C } @Override - public

ReactiveSqmSelectionQueryImpl setParameter(String name, P value, BindableType

type) { + public

ReactiveSqmSelectionQueryImpl setParameter(String name, P value, Type

type) { super.setParameter( name, value, type ); return this; } @@ -366,7 +367,7 @@ public

ReactiveSqmSelectionQueryImpl setParameter(int position, P value, } @Override - public

ReactiveSqmSelectionQueryImpl setParameter(int position, P value, BindableType

type) { + public

ReactiveSqmSelectionQueryImpl setParameter(int position, P value, Type

type) { super.setParameter( position, value, type ); return this; } @@ -393,7 +394,7 @@ public

ReactiveSqmSelectionQueryImpl setParameter(QueryParameter

param public

ReactiveSqmSelectionQueryImpl setParameter( QueryParameter

parameter, P value, - BindableType

type) { + Type

type) { super.setParameter( parameter, value, type ); return this; } @@ -462,7 +463,7 @@ public

ReactiveSqmSelectionQueryImpl setParameterList( public

ReactiveSqmSelectionQueryImpl setParameterList( String name, Collection values, - BindableType

type) { + Type

type) { super.setParameterList( name, values, type ); return this; } @@ -480,7 +481,7 @@ public

ReactiveSqmSelectionQueryImpl setParameterList(String name, P[] va } @Override - public

ReactiveSqmSelectionQueryImpl setParameterList(String name, P[] values, BindableType

type) { + public

ReactiveSqmSelectionQueryImpl setParameterList(String name, P[] values, Type

type) { super.setParameterList( name, values, type ); return this; } @@ -504,7 +505,7 @@ public

ReactiveSqmSelectionQueryImpl setParameterList( public

ReactiveSqmSelectionQueryImpl setParameterList( int position, Collection values, - BindableType

type) { + Type

type) { super.setParameterList( position, values, type ); return this; } @@ -522,7 +523,7 @@ public

ReactiveSqmSelectionQueryImpl setParameterList(int position, P[] v } @Override - public

ReactiveSqmSelectionQueryImpl setParameterList(int position, P[] values, BindableType

type) { + public

ReactiveSqmSelectionQueryImpl setParameterList(int position, P[] values, Type

type) { super.setParameterList( position, values, type ); return this; } @@ -548,7 +549,7 @@ public

ReactiveSqmSelectionQueryImpl setParameterList( public

ReactiveSqmSelectionQueryImpl setParameterList( QueryParameter

parameter, Collection values, - BindableType

type) { + Type

type) { super.setParameterList( parameter, values, type ); return this; } @@ -572,7 +573,7 @@ public

ReactiveSqmSelectionQueryImpl setParameterList( public

ReactiveSqmSelectionQueryImpl setParameterList( QueryParameter

parameter, P[] values, - BindableType

type) { + Type

type) { super.setParameterList( parameter, values, type ); return this; } diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/ReactiveSqmQueryImplementor.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/ReactiveSqmQueryImplementor.java index 090ab4748..dd19efc21 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/ReactiveSqmQueryImplementor.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/ReactiveSqmQueryImplementor.java @@ -16,7 +16,6 @@ import org.hibernate.Incubating; import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.query.BindableType; import org.hibernate.query.QueryParameter; import org.hibernate.query.ResultListTransformer; import org.hibernate.query.TupleTransformer; @@ -28,6 +27,7 @@ import jakarta.persistence.LockModeType; import jakarta.persistence.Parameter; import jakarta.persistence.TemporalType; +import jakarta.persistence.metamodel.Type; /** @@ -101,7 +101,7 @@ public interface ReactiveSqmQueryImplementor extends ReactiveQueryImplementor

ReactiveSqmQueryImplementor setParameter(String name, P value, Class

type); @Override -

ReactiveSqmQueryImplementor setParameter(String name, P value, BindableType

type); +

ReactiveSqmQueryImplementor setParameter(String name, P value, Type

type); @Override ReactiveSqmQueryImplementor setParameter(String name, Instant value, TemporalType temporalType); @@ -119,7 +119,7 @@ public interface ReactiveSqmQueryImplementor extends ReactiveQueryImplementor

ReactiveSqmQueryImplementor setParameter(int position, P value, Class

type); @Override -

ReactiveSqmQueryImplementor setParameter(int position, P value, BindableType

type); +

ReactiveSqmQueryImplementor setParameter(int position, P value, Type

type); @Override ReactiveSqmQueryImplementor setParameter(int position, Instant value, TemporalType temporalType); @@ -137,7 +137,7 @@ public interface ReactiveSqmQueryImplementor extends ReactiveQueryImplementor

ReactiveSqmQueryImplementor setParameter(QueryParameter

parameter, P value, Class

type); @Override -

ReactiveSqmQueryImplementor setParameter(QueryParameter

parameter, P val, BindableType

type); +

ReactiveSqmQueryImplementor setParameter(QueryParameter

parameter, P val, Type

type); @Override ReactiveSqmQueryImplementor setParameter(Parameter param, T value); @@ -155,7 +155,7 @@ public interface ReactiveSqmQueryImplementor extends ReactiveQueryImplementor

ReactiveSqmQueryImplementor setParameterList(String name, Collection values, Class

javaType); @Override -

ReactiveSqmQueryImplementor setParameterList(String name, Collection values, BindableType

type); +

ReactiveSqmQueryImplementor setParameterList(String name, Collection values, Type

type); @Override ReactiveSqmQueryImplementor setParameterList(String name, Object[] values); @@ -164,7 +164,7 @@ public interface ReactiveSqmQueryImplementor extends ReactiveQueryImplementor

ReactiveSqmQueryImplementor setParameterList(String name, P[] values, Class

javaType); @Override -

ReactiveSqmQueryImplementor setParameterList(String name, P[] values, BindableType

type); +

ReactiveSqmQueryImplementor setParameterList(String name, P[] values, Type

type); @Override ReactiveSqmQueryImplementor setParameterList(int position, @SuppressWarnings("rawtypes") Collection values); @@ -173,7 +173,7 @@ public interface ReactiveSqmQueryImplementor extends ReactiveQueryImplementor

ReactiveSqmQueryImplementor setParameterList(int position, Collection values, Class

javaType); @Override -

ReactiveSqmQueryImplementor setParameterList(int position, Collection values, BindableType

type); +

ReactiveSqmQueryImplementor setParameterList(int position, Collection values, Type

type); @Override ReactiveSqmQueryImplementor setParameterList(int position, Object[] values); @@ -182,7 +182,7 @@ public interface ReactiveSqmQueryImplementor extends ReactiveQueryImplementor

ReactiveSqmQueryImplementor setParameterList(int position, P[] values, Class

javaType); @Override -

ReactiveSqmQueryImplementor setParameterList(int position, P[] values, BindableType

type); +

ReactiveSqmQueryImplementor setParameterList(int position, P[] values, Type

type); @Override

ReactiveSqmQueryImplementor setParameterList(QueryParameter

parameter, Collection values); @@ -191,7 +191,7 @@ public interface ReactiveSqmQueryImplementor extends ReactiveQueryImplementor

ReactiveSqmQueryImplementor setParameterList(QueryParameter

parameter, Collection values, Class

javaType); @Override -

ReactiveSqmQueryImplementor setParameterList(QueryParameter

parameter, Collection values, BindableType

type); +

ReactiveSqmQueryImplementor setParameterList(QueryParameter

parameter, Collection values, Type

type); @Override

ReactiveSqmQueryImplementor setParameterList(QueryParameter

parameter, P[] values); @@ -200,7 +200,7 @@ public interface ReactiveSqmQueryImplementor extends ReactiveQueryImplementor

ReactiveSqmQueryImplementor setParameterList(QueryParameter

parameter, P[] values, Class

javaType); @Override -

ReactiveSqmQueryImplementor setParameterList(QueryParameter

parameter, P[] values, BindableType

type); +

ReactiveSqmQueryImplementor setParameterList(QueryParameter

parameter, P[] values, Type

type); @Override ReactiveSqmQueryImplementor setProperties(Object bean); 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 d86ffd7d1..264279c90 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 @@ -80,6 +80,7 @@ import org.hibernate.query.sqm.tree.insert.SqmInsertStatement; import org.hibernate.query.sqm.tree.select.SqmQueryGroup; import org.hibernate.query.sqm.tree.select.SqmQuerySpec; +import org.hibernate.query.sqm.tree.select.SqmSelectClause; import org.hibernate.query.sqm.tree.select.SqmSelectStatement; import org.hibernate.query.sqm.tree.update.SqmUpdateStatement; import org.hibernate.reactive.common.AffectedEntities; @@ -311,9 +312,8 @@ public CompletionStage reactiveFetch(T association, boolean unproxy) { if ( association == null ) { return nullFuture(); } - - if ( association instanceof HibernateProxy proxy ) { - LazyInitializer initializer = proxy.getHibernateLazyInitializer(); + else if ( association instanceof HibernateProxy proxy ) { + final LazyInitializer initializer = proxy.getHibernateLazyInitializer(); if ( !initializer.isUninitialized() ) { return completedFuture( unproxy ? (T) initializer.getImplementation() : association ); } @@ -371,9 +371,10 @@ public ReactiveQuery createReactiveQuery(CriteriaQuery criteriaQuery) final SqmSelectStatement selectStatement = (SqmSelectStatement) criteriaQuery; if ( ! ( selectStatement.getQueryPart() instanceof SqmQueryGroup ) ) { final SqmQuerySpec querySpec = selectStatement.getQuerySpec(); - if ( querySpec.getSelectClause().getSelections().isEmpty() ) { + final SqmSelectClause selectClause = querySpec.getSelectClause(); + if ( selectClause.getSelections().isEmpty() ) { if ( querySpec.getFromClause().getRoots().size() == 1 ) { - querySpec.getSelectClause().setSelection( querySpec.getFromClause().getRoots().get(0) ); + selectClause.setSelection( querySpec.getFromClause().getRoots().get(0) ); } } } @@ -401,24 +402,27 @@ public ReactiveQuery createReactiveQuery(TypedQueryReference typedQuer final CriteriaQuery query = specification.buildCriteria( getCriteriaBuilder() ); return new ReactiveQuerySqmImpl<>( (SqmStatement) query, specification.getResultType(), this ); } - if ( typedQueryReference instanceof MutationSpecificationImpl specification ) { + else if ( typedQueryReference instanceof MutationSpecificationImpl specification ) { final CommonAbstractCriteria query = specification.buildCriteria( getCriteriaBuilder() ); // Workaround for ORM, can be remove when this issue is solved: https://hibernate.atlassian.net/browse/HHH-19386 - Class type = specification.getResultType() == Void.class - ? null - : (Class) specification.getResultType(); + final Class type = + specification.getResultType() == Void.class + ? null + : (Class) specification.getResultType(); return new ReactiveQuerySqmImpl<>( (SqmStatement) query, type, this ); } - @SuppressWarnings("unchecked") - // this cast is fine because of all our impls of TypedQueryReference return Class - final Class resultType = (Class) typedQueryReference.getResultType(); - ReactiveQueryImplementor query = (ReactiveQueryImplementor) buildNamedQuery( - typedQueryReference.getName(), - memento -> createSqmQueryImplementor( resultType, memento ), - memento -> createNativeQueryImplementor( resultType, memento ) - ); - typedQueryReference.getHints().forEach( query::setHint ); - return query; + else { + @SuppressWarnings("unchecked") + // this cast is fine because of all our impls of TypedQueryReference return Class + final Class resultType = (Class) typedQueryReference.getResultType(); + final ReactiveQueryImplementor query = (ReactiveQueryImplementor) buildNamedQuery( + typedQueryReference.getName(), + memento -> createSqmQueryImplementor(resultType, memento), + memento -> createNativeQueryImplementor(resultType, memento) + ); + typedQueryReference.getHints().forEach(query::setHint); + return query; + } } @Override