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

support for @By("#id") in Jakarta Data parameters

This commit is contained in:
Gavin King 2024-03-18 22:56:30 +01:00
parent 5cd6ec4b54
commit b5bfe07d36
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/BookAuthorRepository.java
View File

@ -48,6 +48,9 @@ public interface BookAuthorRepository {
@Find @Find
Book book(String isbn); Book book(String isbn);
@Find
Optional<Book> bookMaybe(@By("#id") String id);
@Find @Find
Book[] books(@By("isbn") String[] isbns); Book[] books(@By("isbn") String[] isbns);

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

@ -83,6 +83,7 @@ import static org.hibernate.processor.util.TypeUtils.getAnnotationValue;
import static org.hibernate.processor.util.TypeUtils.getAnnotationValueRef; import static org.hibernate.processor.util.TypeUtils.getAnnotationValueRef;
import static org.hibernate.processor.util.TypeUtils.hasAnnotation; import static org.hibernate.processor.util.TypeUtils.hasAnnotation;
import static org.hibernate.processor.util.TypeUtils.primitiveClassMatchesKind; import static org.hibernate.processor.util.TypeUtils.primitiveClassMatchesKind;
import static org.hibernate.processor.util.TypeUtils.propertyName;
/** /**
* Class used to collect meta information about an annotated type (entity, embeddable or mapped superclass). * Class used to collect meta information about an annotated type (entity, embeddable or mapped superclass).
@ -1007,7 +1008,7 @@ public class AnnotationMetaEntity extends AnnotationMeta {
private void createCriteriaFinder( private void createCriteriaFinder(
ExecutableElement method, TypeMirror returnType, @Nullable String containerType, TypeElement entity) { ExecutableElement method, TypeMirror returnType, @Nullable String containerType, TypeElement entity) {
final String methodName = method.getSimpleName().toString(); final String methodName = method.getSimpleName().toString();
final List<String> paramNames = parameterNames( method ); final List<String> paramNames = parameterNames( method, entity );
final List<String> paramTypes = parameterTypes( method ); final List<String> paramTypes = parameterTypes( method );
final String[] sessionType = sessionTypeFromParameters( paramNames, paramTypes ); final String[] sessionType = sessionTypeFromParameters( paramNames, paramTypes );
final String methodKey = methodName + paramTypes; final String methodKey = methodName + paramTypes;
@ -1206,7 +1207,7 @@ public class AnnotationMetaEntity extends AnnotationMeta {
private void createMultipleParameterFinder(ExecutableElement method, TypeMirror returnType, TypeElement entity) { private void createMultipleParameterFinder(ExecutableElement method, TypeMirror returnType, TypeElement entity) {
final String methodName = method.getSimpleName().toString(); final String methodName = method.getSimpleName().toString();
final List<String> paramNames = parameterNames( method ); final List<String> paramNames = parameterNames( method, entity );
final List<String> paramTypes = parameterTypes( method ); final List<String> paramTypes = parameterTypes( method );
final String[] sessionType = sessionTypeFromParameters( paramNames, paramTypes ); final String[] sessionType = sessionTypeFromParameters( paramNames, paramTypes );
final String methodKey = methodName + paramTypes; final String methodKey = methodName + paramTypes;
@ -1270,7 +1271,7 @@ public class AnnotationMetaEntity extends AnnotationMeta {
method.getParameters().stream() method.getParameters().stream()
.filter(AnnotationMetaEntity::isFinderParameterMappingToAttribute) .filter(AnnotationMetaEntity::isFinderParameterMappingToAttribute)
.findFirst().orElseThrow(); .findFirst().orElseThrow();
final List<String> paramNames = parameterNames( method ); final List<String> paramNames = parameterNames( method, entity );
final List<String> paramTypes = parameterTypes( method ); final List<String> paramTypes = parameterTypes( method );
final String[] sessionType = sessionTypeFromParameters( paramNames, paramTypes ); final String[] sessionType = sessionTypeFromParameters( paramNames, paramTypes );
final FieldType fieldType = validateFinderParameter( entity, parameter ); final FieldType fieldType = validateFinderParameter( entity, parameter );
@ -1520,8 +1521,11 @@ public class AnnotationMetaEntity extends AnnotationMeta {
final AccessType accessType = getAccessType(entityType); final AccessType accessType = getAccessType(entityType);
final String nextToken = tokens.nextToken(); final String nextToken = tokens.nextToken();
for ( Element member : entityType.getEnclosedElements() ) { for ( Element member : entityType.getEnclosedElements() ) {
if ( "#id".equals(nextToken) && hasAnnotation( member, ID) ) {
return member;
}
final Element match = final Element match =
memberMatchingPath(entityType, member, accessType, tokens, nextToken); memberMatchingPath( entityType, member, accessType, tokens, nextToken );
if ( match != null ) { if ( match != null ) {
return match; return match;
} }
@ -2038,6 +2042,20 @@ public class AnnotationMetaEntity extends AnnotationMeta {
.collect(toList()); .collect(toList());
} }
private List<String> parameterNames(ExecutableElement method, TypeElement entity) {
final String idName =
// account for special @By("#id") hack in Jakarta Data
entity.getEnclosedElements().stream()
.filter(member -> hasAnnotation(member, ID))
.map(member -> propertyName(this, member))
.findFirst()
.orElse("id");
return method.getParameters().stream()
.map(AnnotationMetaEntity::parameterName)
.map(name -> "#id".equals(name) ? idName : name)
.collect(toList());
}
private static List<String> parameterNames(ExecutableElement method) { private static List<String> parameterNames(ExecutableElement method) {
return method.getParameters().stream() return method.getParameters().stream()
.map(AnnotationMetaEntity::parameterName) .map(AnnotationMetaEntity::parameterName)