From 4e3735d0c0a1aad4c83efccd83a2d81783c7bfa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Cedomir=20Igaly?= Date: Wed, 18 Dec 2024 19:03:44 +0100 Subject: [PATCH] HHH-18960 Reverted mistakenly commited change --- .../processor/annotation/AnnotationMetaEntity.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java index ab0779d0f3..e5ddf7fa21 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java @@ -64,7 +64,6 @@ import jakarta.persistence.AccessType; import static java.beans.Introspector.decapitalize; import static java.lang.Boolean.FALSE; import static java.util.Collections.emptyList; -import static java.util.Objects.requireNonNullElse; import static java.util.stream.Collectors.toList; import static javax.lang.model.util.ElementFilter.fieldsIn; import static javax.lang.model.util.ElementFilter.methodsIn; @@ -2741,13 +2740,11 @@ public class AnnotationMetaEntity extends AnnotationMeta { if ( queryParamType!=null //TODO: arguments of functions get assigned "unknown" which sucks && !"unknown".equals(queryParamType) ) { - final String realQueryParamType = - requireNonNullElse( context.qualifiedNameForEntityName( queryParamType ), queryParamType ); if ( param.getName() != null ) { - checkNamedParameter(param, paramNames, paramTypes, method, mirror, value, realQueryParamType); + checkNamedParameter(param, paramNames, paramTypes, method, mirror, value, queryParamType); } else if ( param.getPosition() != null ) { - checkOrdinalParameter(param, paramNames, paramTypes, method, mirror, value, realQueryParamType); + checkOrdinalParameter(param, paramNames, paramTypes, method, mirror, value, queryParamType); } } }