fix to @OrderBy for @Query methods with primary entity type
don't think this is even strictly-speaking required by Jakarta Data but we will allow it Signed-off-by: Gavin King <gavin@hibernate.org>
This commit is contained in:
parent
c7852feb55
commit
e21d139a84
|
@ -1541,23 +1541,26 @@ public class AnnotationMetaEntity extends AnnotationMeta {
|
|||
Diagnostic.Kind.ERROR );
|
||||
}
|
||||
|
||||
private List<OrderBy> orderByList(ExecutableElement method, TypeElement entityType) {
|
||||
final AnnotationMirror orderByList =
|
||||
getAnnotationMirror( method, "jakarta.data.repository.OrderBy.List" );
|
||||
if ( orderByList != null ) {
|
||||
final List<OrderBy> result = new ArrayList<>();
|
||||
@SuppressWarnings("unchecked")
|
||||
final List<AnnotationValue> list = (List<AnnotationValue>)
|
||||
castNonNull( getAnnotationValue( orderByList, "value" ) ).getValue();
|
||||
for ( AnnotationValue element : list ) {
|
||||
result.add( orderByExpression( castNonNull( (AnnotationMirror) element.getValue() ), entityType, method ) );
|
||||
private List<OrderBy> orderByList(ExecutableElement method, TypeElement returnType) {
|
||||
final TypeElement entityType = implicitEntityType( returnType );
|
||||
if ( entityType != null ) {
|
||||
final AnnotationMirror orderByList =
|
||||
getAnnotationMirror( method, "jakarta.data.repository.OrderBy.List" );
|
||||
if ( orderByList != null ) {
|
||||
final List<OrderBy> result = new ArrayList<>();
|
||||
@SuppressWarnings("unchecked")
|
||||
final List<AnnotationValue> list = (List<AnnotationValue>)
|
||||
castNonNull( getAnnotationValue( orderByList, "value" ) ).getValue();
|
||||
for ( AnnotationValue element : list ) {
|
||||
result.add( orderByExpression( castNonNull( (AnnotationMirror) element.getValue() ), entityType, method ) );
|
||||
}
|
||||
return result;
|
||||
}
|
||||
final AnnotationMirror orderBy =
|
||||
getAnnotationMirror( method, "jakarta.data.repository.OrderBy" );
|
||||
if ( orderBy != null ) {
|
||||
return List.of( orderByExpression(orderBy, entityType, method) );
|
||||
}
|
||||
return result;
|
||||
}
|
||||
final AnnotationMirror orderBy =
|
||||
getAnnotationMirror( method, "jakarta.data.repository.OrderBy" );
|
||||
if ( orderBy != null ) {
|
||||
return List.of( orderByExpression(orderBy, entityType, method) );
|
||||
}
|
||||
return emptyList();
|
||||
}
|
||||
|
@ -2214,6 +2217,18 @@ public class AnnotationMetaEntity extends AnnotationMeta {
|
|||
}
|
||||
}
|
||||
|
||||
private @Nullable TypeElement implicitEntityType(@Nullable TypeElement resultType) {
|
||||
if ( resultType != null && hasAnnotation(resultType, ENTITY) ) {
|
||||
return resultType;
|
||||
}
|
||||
else if ( primaryEntity != null ) {
|
||||
return primaryEntity;
|
||||
}
|
||||
else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static String entityName(DeclaredType resultType, AnnotationMirror annotation) {
|
||||
final AnnotationValue name = getAnnotationValue(annotation, "name");
|
||||
if (name != null) {
|
||||
|
|
Loading…
Reference in New Issue