Skip to content

Commit 3ec4ff9

Browse files
gavinkinggavinking
committed
update to 7.0.0.CR2
adapt to changes to setParameter() signature
1 parent 8828352 commit 3ec4ff9

13 files changed

+161
-156
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ org.gradle.java.installations.auto-download=false
3535
#enableMavenLocalRepo = true
3636

3737
# The default Hibernate ORM version (override using `-PhibernateOrmVersion=the.version.you.want`)
38-
hibernateOrmVersion = 7.0.0.CR1
38+
hibernateOrmVersion = 7.0.0.CR2
3939

4040
# Override default Hibernate ORM Gradle plugin version
4141
# Using the stable version because I don't know how to configure the build to download the snapshot version from

‎hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveMutationQuery.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
import java.util.concurrent.CompletionStage;
1414

1515
import org.hibernate.FlushMode;
16-
import org.hibernate.query.BindableType;
1716
import org.hibernate.query.CommonQueryContract;
1817
import org.hibernate.query.QueryParameter;
1918

2019
import jakarta.persistence.Parameter;
2120
import jakarta.persistence.TemporalType;
21+
import jakarta.persistence.metamodel.Type;
2222

2323
/**
2424
* @see org.hibernate.query.MutationQuery
@@ -33,7 +33,7 @@ public interface ReactiveMutationQuery<R> extends CommonQueryContract {
3333
<P> ReactiveMutationQuery<R> setParameter(String name, P value, Class<P> type);
3434

3535
@Override
36-
<P> ReactiveMutationQuery<R> setParameter(String name, P value, BindableType<P> type);
36+
<P> ReactiveMutationQuery<R> setParameter(String name, P value, Type<P> type);
3737

3838
@Override
3939
ReactiveMutationQuery<R> setParameter(String name, Instant value, TemporalType temporalType);
@@ -51,7 +51,7 @@ public interface ReactiveMutationQuery<R> extends CommonQueryContract {
5151
<P> ReactiveMutationQuery<R> setParameter(int position, P value, Class<P> type);
5252

5353
@Override
54-
<P> ReactiveMutationQuery<R> setParameter(int position, P value, BindableType<P> type);
54+
<P> ReactiveMutationQuery<R> setParameter(int position, P value, Type<P> type);
5555

5656
@Override
5757
ReactiveMutationQuery<R> setParameter(int position, Instant value, TemporalType temporalType);
@@ -69,7 +69,7 @@ public interface ReactiveMutationQuery<R> extends CommonQueryContract {
6969
<P> ReactiveMutationQuery<R> setParameter(QueryParameter<P> parameter, P value, Class<P> type);
7070

7171
@Override
72-
<P> ReactiveMutationQuery<R> setParameter(QueryParameter<P> parameter, P val, BindableType<P> type);
72+
<P> ReactiveMutationQuery<R> setParameter(QueryParameter<P> parameter, P val, Type<P> type);
7373

7474
@Override
7575
<T> ReactiveMutationQuery<R> setParameter(Parameter<T> param, T value);
@@ -87,7 +87,7 @@ public interface ReactiveMutationQuery<R> extends CommonQueryContract {
8787
<P> ReactiveMutationQuery<R> setParameterList(String name, Collection<? extends P> values, Class<P> javaType);
8888

8989
@Override
90-
<P> ReactiveMutationQuery<R> setParameterList(String name, Collection<? extends P> values, BindableType<P> type);
90+
<P> ReactiveMutationQuery<R> setParameterList(String name, Collection<? extends P> values, Type<P> type);
9191

9292
@Override
9393
ReactiveMutationQuery<R> setParameterList(String name, Object[] values);
@@ -96,7 +96,7 @@ public interface ReactiveMutationQuery<R> extends CommonQueryContract {
9696
<P> ReactiveMutationQuery<R> setParameterList(String name, P[] values, Class<P> javaType);
9797

9898
@Override
99-
<P> ReactiveMutationQuery<R> setParameterList(String name, P[] values, BindableType<P> type);
99+
<P> ReactiveMutationQuery<R> setParameterList(String name, P[] values, Type<P> type);
100100

101101
@Override
102102
ReactiveMutationQuery<R> setParameterList(int position, Collection values);
@@ -105,7 +105,7 @@ public interface ReactiveMutationQuery<R> extends CommonQueryContract {
105105
<P> ReactiveMutationQuery<R> setParameterList(int position, Collection<? extends P> values, Class<P> javaType);
106106

107107
@Override
108-
<P> ReactiveMutationQuery<R> setParameterList(int position, Collection<? extends P> values, BindableType<P> type);
108+
<P> ReactiveMutationQuery<R> setParameterList(int position, Collection<? extends P> values, Type<P> type);
109109

110110
@Override
111111
ReactiveMutationQuery<R> setParameterList(int position, Object[] values);
@@ -114,7 +114,7 @@ public interface ReactiveMutationQuery<R> extends CommonQueryContract {
114114
<P> ReactiveMutationQuery<R> setParameterList(int position, P[] values, Class<P> javaType);
115115

116116
@Override
117-
<P> ReactiveMutationQuery<R> setParameterList(int position, P[] values, BindableType<P> type);
117+
<P> ReactiveMutationQuery<R> setParameterList(int position, P[] values, Type<P> type);
118118

119119
@Override
120120
<P> ReactiveMutationQuery<R> setParameterList(QueryParameter<P> parameter, Collection<? extends P> values);
@@ -123,7 +123,7 @@ public interface ReactiveMutationQuery<R> extends CommonQueryContract {
123123
<P> ReactiveMutationQuery<R> setParameterList(QueryParameter<P> parameter, Collection<? extends P> values, Class<P> javaType);
124124

125125
@Override
126-
<P> ReactiveMutationQuery<R> setParameterList(QueryParameter<P> parameter, Collection<? extends P> values, BindableType<P> type);
126+
<P> ReactiveMutationQuery<R> setParameterList(QueryParameter<P> parameter, Collection<? extends P> values, Type<P> type);
127127

128128
@Override
129129
<P> ReactiveMutationQuery<R> setParameterList(QueryParameter<P> parameter, P[] values);
@@ -132,7 +132,7 @@ public interface ReactiveMutationQuery<R> extends CommonQueryContract {
132132
<P> ReactiveMutationQuery<R> setParameterList(QueryParameter<P> parameter, P[] values, Class<P> javaType);
133133

134134
@Override
135-
<P> ReactiveMutationQuery<R> setParameterList(QueryParameter<P> parameter, P[] values, BindableType<P> type);
135+
<P> ReactiveMutationQuery<R> setParameterList(QueryParameter<P> parameter, P[] values, Type<P> type);
136136

137137
@Override
138138
ReactiveMutationQuery<R> setProperties(Object bean);

‎hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/ReactiveNativeQuery.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
import java.util.Date;
1212
import java.util.Map;
1313

14+
import jakarta.persistence.metamodel.Type;
1415
import org.hibernate.CacheMode;
1516
import org.hibernate.FlushMode;
1617
import org.hibernate.LockMode;
1718
import org.hibernate.LockOptions;
1819
import org.hibernate.metamodel.model.domain.BasicDomainType;
19-
import org.hibernate.query.BindableType;
2020
import org.hibernate.query.NativeQuery;
2121
import org.hibernate.query.NativeQuery.FetchReturn;
2222
import org.hibernate.query.QueryParameter;
@@ -225,7 +225,7 @@ public interface ReactiveNativeQuery<R> extends ReactiveQuery<R> {
225225
<P> ReactiveNativeQuery<R> setParameter(String name, P val, Class<P> type);
226226

227227
@Override
228-
<P> ReactiveNativeQuery<R> setParameter(String name, P val, BindableType<P> type);
228+
<P> ReactiveNativeQuery<R> setParameter(String name, P val, Type<P> type);
229229

230230
@Override
231231
ReactiveNativeQuery<R> setParameter(String name, Instant value, TemporalType temporalType);
@@ -243,7 +243,7 @@ public interface ReactiveNativeQuery<R> extends ReactiveQuery<R> {
243243
<P> ReactiveNativeQuery<R> setParameter(int position, P val, Class<P> type);
244244

245245
@Override
246-
<P> ReactiveNativeQuery<R> setParameter(int position, P val, BindableType<P> type);
246+
<P> ReactiveNativeQuery<R> setParameter(int position, P val, Type<P> type);
247247

248248
@Override
249249
ReactiveNativeQuery<R> setParameter(int position, Instant value, TemporalType temporalType);
@@ -261,7 +261,7 @@ public interface ReactiveNativeQuery<R> extends ReactiveQuery<R> {
261261
<P> ReactiveNativeQuery<R> setParameter(QueryParameter<P> parameter, P val, Class<P> type);
262262

263263
@Override
264-
<P> ReactiveNativeQuery<R> setParameter(QueryParameter<P> parameter, P val, BindableType<P> type);
264+
<P> ReactiveNativeQuery<R> setParameter(QueryParameter<P> parameter, P val, Type<P> type);
265265

266266
@Override
267267
<P> ReactiveNativeQuery<R> setParameter(Parameter<P> param, P value);
@@ -279,7 +279,7 @@ public interface ReactiveNativeQuery<R> extends ReactiveQuery<R> {
279279
<P> ReactiveNativeQuery<R> setParameterList(String name, Collection<? extends P> values, Class<P> type);
280280

281281
@Override
282-
<P> ReactiveNativeQuery<R> setParameterList(String name, Collection<? extends P> values, BindableType<P> type);
282+
<P> ReactiveNativeQuery<R> setParameterList(String name, Collection<? extends P> values, Type<P> type);
283283

284284
@Override
285285
ReactiveNativeQuery<R> setParameterList(String name, Object[] values);
@@ -288,7 +288,7 @@ public interface ReactiveNativeQuery<R> extends ReactiveQuery<R> {
288288
<P> ReactiveNativeQuery<R> setParameterList(String name, P[] values, Class<P> type);
289289

290290
@Override
291-
<P> ReactiveNativeQuery<R> setParameterList(String name, P[] values, BindableType<P> type);
291+
<P> ReactiveNativeQuery<R> setParameterList(String name, P[] values, Type<P> type);
292292

293293
@Override
294294
ReactiveNativeQuery<R> setParameterList(int position, @SuppressWarnings("rawtypes") Collection values);
@@ -297,7 +297,7 @@ public interface ReactiveNativeQuery<R> extends ReactiveQuery<R> {
297297
<P> ReactiveNativeQuery<R> setParameterList(int position, Collection<? extends P> values, Class<P> type);
298298

299299
@Override
300-
<P> ReactiveNativeQuery<R> setParameterList(int position, Collection<? extends P> values, BindableType<P> javaType);
300+
<P> ReactiveNativeQuery<R> setParameterList(int position, Collection<? extends P> values, Type<P> javaType);
301301

302302
@Override
303303
ReactiveNativeQuery<R> setParameterList(int position, Object[] values);
@@ -306,7 +306,7 @@ public interface ReactiveNativeQuery<R> extends ReactiveQuery<R> {
306306
<P> ReactiveNativeQuery<R> setParameterList(int position, P[] values, Class<P> javaType);
307307

308308
@Override
309-
<P> ReactiveNativeQuery<R> setParameterList(int position, P[] values, BindableType<P> javaType);
309+
<P> ReactiveNativeQuery<R> setParameterList(int position, P[] values, Type<P> javaType);
310310

311311
@Override
312312
<P> ReactiveNativeQuery<R> setParameterList(QueryParameter<P> parameter, Collection<? extends P> values);
@@ -315,7 +315,7 @@ public interface ReactiveNativeQuery<R> extends ReactiveQuery<R> {
315315
<P> ReactiveNativeQuery<R> setParameterList(QueryParameter<P> parameter, Collection<? extends P> values, Class<P> javaType);
316316

317317
@Override
318-
<P> ReactiveNativeQuery<R> setParameterList(QueryParameter<P> parameter, Collection<? extends P> values, BindableType<P> type);
318+
<P> ReactiveNativeQuery<R> setParameterList(QueryParameter<P> parameter, Collection<? extends P> values, Type<P> type);
319319

320320
@Override
321321
<P> ReactiveNativeQuery<R> setParameterList(QueryParameter<P> parameter, P[] values);
@@ -324,7 +324,7 @@ public interface ReactiveNativeQuery<R> extends ReactiveQuery<R> {
324324
<P> ReactiveNativeQuery<R> setParameterList(QueryParameter<P> parameter, P[] values, Class<P> javaType);
325325

326326
@Override
327-
<P> ReactiveNativeQuery<R> setParameterList(QueryParameter<P> parameter, P[] values, BindableType<P> type);
327+
<P> ReactiveNativeQuery<R> setParameterList(QueryParameter<P> parameter, P[] values, Type<P> type);
328328

329329
@Override
330330
ReactiveNativeQuery<R> setProperties(Object bean);

0 commit comments

Comments
 (0)