Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow binding Lists to 'in' condition parameters for @Query method 

required by Jakarta Data, and generally very useful!

Signed-off-by: Gavin King <gavin@hibernate.org>
This commit is contained in:
Gavin King 2024-03-29 14:45:14 +01:00
parent 473965f228
commit eb1b78ff0b
1 changed files with 59 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java
View File

@ -2493,44 +2493,71 @@ public class AnnotationMetaEntity extends AnnotationMeta {
private void checkParameter( private void checkParameter(
SqmParameter<?> param, List<String> paramNames, List<String> paramTypes, SqmParameter<?> param, List<String> paramNames, List<String> paramTypes,
ExecutableElement method, AnnotationMirror mirror, AnnotationValue value) { ExecutableElement method, AnnotationMirror mirror, AnnotationValue value) {
final SqmExpressible<?> expressible = param.getExpressible(); final SqmExpressible<?> expressible = param.getExpressible(); //same object as param.getAnticipatedType()
final String queryParamType = expressible == null ? "unknown" : expressible.getTypeName(); //getTypeName() can return "unknown" final String queryParamType = expressible == null ? null : expressible.getTypeName(); //getTypeName() can return "unknown"
if ( param.getName() != null ) { if ( queryParamType!=null
final String name = param.getName(); //TODO: arguments of functions get assigned "unknown" which sucks
int index = paramNames.indexOf( name ); && !"unknown".equals(queryParamType) ) {
if ( index < 0 ) { if ( param.getName() != null ) {
message( method, mirror, value, checkNamedParameter(param, paramNames, paramTypes, method, mirror, value, queryParamType);
"missing method parameter for query parameter :" + name
+ " (add a parameter '" + queryParamType + ' ' + name + "' to '" + method.getSimpleName() + "')",
Diagnostic.Kind.ERROR );
} }
else if ( !isLegalAssignment( paramTypes.get(index), queryParamType ) ) { else if ( param.getPosition() != null ) {
message( method, mirror, value, checkOrdinalParameter(param, paramNames, paramTypes, method, mirror, value, queryParamType);
"parameter matching query parameter :" + name + " has the wrong type"
+ " (change the method parameter type to '" + queryParamType + "')",
Diagnostic.Kind.ERROR );
}
}
else if ( param.getPosition() != null ) {
int position = param.getPosition();
if ( position > paramNames.size() ) {
message( method, mirror, value,
"missing method parameter for query parameter ?" + position
+ " (add a parameter of type '" + queryParamType + "' to '" + method.getSimpleName() + "')",
Diagnostic.Kind.ERROR );
}
else if ( !isLegalAssignment( paramTypes.get(position-1), queryParamType ) ) {
message( method, mirror, value,
"parameter matching query parameter ?" + position + " has the wrong type"
+ " (change the method parameter type to '" + queryParamType + "')",
Diagnostic.Kind.ERROR );
} }
} }
} }
private void checkOrdinalParameter(
SqmParameter<?> param, List<String> paramNames, List<String> paramTypes, ExecutableElement method,
AnnotationMirror mirror, AnnotationValue value, String queryParamType) {
int position = param.getPosition();
if ( position > paramNames.size() ) {
message(method, mirror, value,
"missing method parameter for query parameter ?" + position
+ " (add a parameter of type '" + queryParamType + "' to '" + method.getSimpleName() + "')",
Diagnostic.Kind.ERROR);
}
else {
final String argType = paramTypes.get(position - 1);
if ( !isLegalAssignment(param, argType, queryParamType) ) {
message(method, mirror, value,
"parameter matching query parameter ?" + position + " has the wrong type"
+ " (change the method parameter type to '" + queryParamType + "')",
Diagnostic.Kind.ERROR);
}
}
}
private void checkNamedParameter(
SqmParameter<?> param, List<String> paramNames, List<String> paramTypes, ExecutableElement method,
AnnotationMirror mirror, AnnotationValue value, String queryParamType) {
final String name = param.getName();
int index = paramNames.indexOf( name );
if ( index < 0 ) {
message(method, mirror, value,
"missing method parameter for query parameter :" + name
+ " (add a parameter '" + queryParamType + ' ' + name + "' to '" + method.getSimpleName() + "')",
Diagnostic.Kind.ERROR);
}
else {
final String argType = paramTypes.get(index);
if ( !isLegalAssignment(param, argType, queryParamType) ) {
message(method, mirror, value,
"parameter matching query parameter :" + name + " has the wrong type"
+ " (change the method parameter type to '" + queryParamType + "')",
Diagnostic.Kind.ERROR);
}
}
}
private static boolean isLegalAssignment(SqmParameter<?> param, String argType, String queryParamType) {
return param.allowMultiValuedBinding()
? isLegalAssignment(argType, LIST + '<' + queryParamType + '>')
: isLegalAssignment(argType, queryParamType);
}
private static boolean isLegalAssignment(String argType, String paramType) { private static boolean isLegalAssignment(String argType, String paramType) {
return paramType.equals("unknown") return paramType.equals(argType)
|| paramType.equals(argType)
|| paramType.equals(fromPrimitive(argType)); || paramType.equals(fromPrimitive(argType));
} }