From 78e411555e2aef20576f9f054039bf4abd825848 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Wed, 14 May 2025 17:15:29 +0200 Subject: [PATCH] [#2227] Remove workaround for HHH-19386 The method getResultType doesn't return Void.class anymore. See https://hibernate.atlassian.net/browse/HHH-19386 --- .../reactive/session/impl/ReactiveSessionImpl.java | 7 +------ .../session/impl/ReactiveStatelessSessionImpl.java | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) 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 264279c90..d03822be6 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 @@ -404,12 +404,7 @@ public ReactiveQuery createReactiveQuery(TypedQueryReference typedQuer } 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 - final Class type = - specification.getResultType() == Void.class - ? null - : (Class) specification.getResultType(); - return new ReactiveQuerySqmImpl<>( (SqmStatement) query, type, this ); + return new ReactiveQuerySqmImpl<>( (SqmStatement) query, (Class) specification.getResultType(), this ); } else { @SuppressWarnings("unchecked") diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java index be9dc87b0..1c8be13e6 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java @@ -942,11 +942,7 @@ public ReactiveQuery createReactiveQuery(TypedQueryReference typedQuer } 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 = (Class) specification.getResultType() == Void.class - ? null - : (Class) specification.getResultType(); - return new ReactiveQuerySqmImpl<>( (SqmStatement) query, type, this ); + return new ReactiveQuerySqmImpl<>( (SqmStatement) query, (Class) specification.getResultType(), this ); } @SuppressWarnings("unchecked") // this cast is fine because of all our impls of TypedQueryReference return Class