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

HHH-16633 unbreak support for @Embeddable Java records

This commit is contained in:
Gavin King 2023-07-10 18:12:16 +02:00
parent c8c5d05330
commit 10b17a6430
4 changed files with 61 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java
View File

@ -43,7 +43,11 @@ import static org.hibernate.jpamodelgen.util.Constants.FIND;
import static org.hibernate.jpamodelgen.util.Constants.HQL;
import static org.hibernate.jpamodelgen.util.Constants.SQL;
import static org.hibernate.jpamodelgen.util.StringUtil.isProperty;
import static org.hibernate.jpamodelgen.util.TypeUtils.*;
import static org.hibernate.jpamodelgen.util.TypeUtils.containsAnnotation;
import static org.hibernate.jpamodelgen.util.TypeUtils.getCollectionElementType;
import static org.hibernate.jpamodelgen.util.TypeUtils.isAnnotationMirrorOfType;
import static org.hibernate.jpamodelgen.util.TypeUtils.isClassOrRecordType;
import static org.hibernate.jpamodelgen.util.TypeUtils.toTypeString;
/**
* Main annotation processor.
@ -194,7 +198,7 @@ public class JPAMetaModelEntityProcessor extends AbstractProcessor {
for ( Element element : roundEnvironment.getRootElements() ) {
try {
if ( isJPAEntity( element ) ) {
if ( isEntityOrEmbeddable( element ) ) {
context.logMessage( Diagnostic.Kind.OTHER, "Processing annotated entity class '" + element + "'" );
handleRootElementAnnotationMirrors( element );
}
@ -230,21 +234,19 @@ public class JPAMetaModelEntityProcessor extends AbstractProcessor {
private void createMetaModelClasses() {
for ( Metamodel aux : context.getMetaAuxiliaries() ) {
if ( context.isAlreadyGenerated( aux.getQualifiedName() ) ) {
continue;
if ( !context.isAlreadyGenerated( aux.getQualifiedName() ) ) {
context.logMessage( Diagnostic.Kind.OTHER, "Writing metamodel for auxiliary '" + aux + "'" );
ClassWriter.writeFile( aux, context );
context.markGenerated( aux.getQualifiedName() );
}
context.logMessage( Diagnostic.Kind.OTHER, "Writing metamodel for auxiliary '" + aux + "'" );
ClassWriter.writeFile( aux, context );
context.markGenerated( aux.getQualifiedName() );
}
for ( Metamodel entity : context.getMetaEntities() ) {
if ( context.isAlreadyGenerated( entity.getQualifiedName() ) ) {
continue;
if ( !context.isAlreadyGenerated( entity.getQualifiedName() ) ) {
context.logMessage( Diagnostic.Kind.OTHER, "Writing metamodel for entity '" + entity + "'" );
ClassWriter.writeFile( entity, context );
context.markGenerated( entity.getQualifiedName() );
}
context.logMessage( Diagnostic.Kind.OTHER, "Writing metamodel for entity '" + entity + "'" );
ClassWriter.writeFile( entity, context );
context.markGenerated( entity.getQualifiedName() );
}
// we cannot process the delayed entities in any order. There might be dependencies between them.
@ -257,18 +259,16 @@ public class JPAMetaModelEntityProcessor extends AbstractProcessor {
// see METAGEN-36
if ( context.isAlreadyGenerated( entity.getQualifiedName() ) ) {
processedEntities.add( entity );
continue;
}
if ( modelGenerationNeedsToBeDeferred( toProcessEntities, entity ) ) {
continue;
else if ( !modelGenerationNeedsToBeDeferred( toProcessEntities, entity ) ) {
context.logMessage(
Diagnostic.Kind.OTHER,
"Writing meta model for embeddable/mapped superclass " + entity
);
ClassWriter.writeFile( entity, context );
context.markGenerated( entity.getQualifiedName() );
processedEntities.add( entity );
}
context.logMessage(
Diagnostic.Kind.OTHER,
"Writing meta model for embeddable/mapped superclass " + entity
);
ClassWriter.writeFile( entity, context );
context.markGenerated( entity.getQualifiedName() );
processedEntities.add( entity );
}
toProcessEntities.removeAll( processedEntities );
if ( toProcessEntities.size() >= toProcessCountBeforeLoop ) {
@ -283,24 +283,24 @@ public class JPAMetaModelEntityProcessor extends AbstractProcessor {
private boolean modelGenerationNeedsToBeDeferred(Collection<Metamodel> entities, Metamodel containedEntity) {
final Element element = containedEntity.getElement();
if ( element instanceof TypeElement ) {
ContainsAttributeTypeVisitor visitor = new ContainsAttributeTypeVisitor( (TypeElement) element, context );
final ContainsAttributeTypeVisitor visitor =
new ContainsAttributeTypeVisitor( (TypeElement) element, context );
for ( Metamodel entity : entities ) {
if ( entity.equals( containedEntity ) ) {
continue;
}
for ( Element subElement : fieldsIn( entity.getElement().getEnclosedElements() ) ) {
TypeMirror mirror = subElement.asType();
if ( TypeKind.DECLARED == mirror.getKind() ) {
if ( mirror.accept( visitor, subElement ) ) {
return true;
if ( !entity.equals( containedEntity ) ) {
for ( Element subElement : fieldsIn( entity.getElement().getEnclosedElements() ) ) {
TypeMirror mirror = subElement.asType();
if ( TypeKind.DECLARED == mirror.getKind() ) {
if ( mirror.accept( visitor, subElement ) ) {
return true;
}
}
}
}
for ( Element subElement : methodsIn( entity.getElement().getEnclosedElements() ) ) {
TypeMirror mirror = subElement.asType();
if ( TypeKind.DECLARED == mirror.getKind() ) {
if ( mirror.accept( visitor, subElement ) ) {
return true;
for ( Element subElement : methodsIn( entity.getElement().getEnclosedElements() ) ) {
TypeMirror mirror = subElement.asType();
if ( TypeKind.DECLARED == mirror.getKind() ) {
if ( mirror.accept( visitor, subElement ) ) {
return true;
}
}
}
}
@ -309,7 +309,7 @@ public class JPAMetaModelEntityProcessor extends AbstractProcessor {
return false;
}
private boolean isJPAEntity(Element element) {
private static boolean isEntityOrEmbeddable(Element element) {
return containsAnnotation(
element,
Constants.ENTITY,
@ -341,22 +341,23 @@ public class JPAMetaModelEntityProcessor extends AbstractProcessor {
}
private void handleRootElementAnnotationMirrors(final Element element) {
for ( AnnotationMirror mirror : element.getAnnotationMirrors() ) {
if ( element.getKind() == ElementKind.CLASS ) {
final String qualifiedName = ( (TypeElement) element ).getQualifiedName().toString();
if ( isClassOrRecordType( element ) ) {
for ( AnnotationMirror mirror : element.getAnnotationMirrors() ) {
final TypeElement typeElement = (TypeElement) element;
final String qualifiedName = typeElement.getQualifiedName().toString();
final Metamodel alreadyExistingMetaEntity = tryGettingExistingEntityFromContext( mirror, qualifiedName );
if ( alreadyExistingMetaEntity != null && alreadyExistingMetaEntity.isMetaComplete() ) {
context.logMessage(
Diagnostic.Kind.OTHER,
"Skipping processing of annotations for '" + qualifiedName
+ "' since xml configuration is metadata complete.");
+ "' since XML configuration is metadata complete.");
}
else {
boolean requiresLazyMemberInitialization
= containsAnnotation( element, Constants.EMBEDDABLE )
|| containsAnnotation( element, Constants.MAPPED_SUPERCLASS );
final AnnotationMetaEntity metaEntity =
AnnotationMetaEntity.create( (TypeElement) element, context, requiresLazyMemberInitialization );
AnnotationMetaEntity.create( typeElement, context, requiresLazyMemberInitialization );
if ( alreadyExistingMetaEntity != null ) {
metaEntity.mergeInMembers( alreadyExistingMetaEntity );
}

10
tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java
View File

@ -288,9 +288,9 @@ public class AnnotationMetaEntity extends AnnotationMeta {
* it.
*/
private String addDaoConstructor(ExecutableElement getterOrSetter) {
String name = getterOrSetter.getSimpleName().toString();
String typeName = element.getSimpleName().toString() + '_';
String sessionType = getterOrSetter.getReturnType().toString();
final String name = getterOrSetter.getSimpleName().toString();
final String typeName = element.getSimpleName().toString() + '_';
final String sessionType = getterOrSetter.getReturnType().toString();
putMember( name,
new DaoConstructor(
this,
@ -424,13 +424,13 @@ public class AnnotationMetaEntity extends AnnotationMeta {
}
private static boolean isLegalRawResultType(String containerTypeName) {
return containerTypeName.equals(List.class.getName())
return containerTypeName.equals(Constants.LIST)
|| containerTypeName.equals(Constants.QUERY)
|| containerTypeName.equals(Constants.HIB_QUERY);
}
private static boolean isLegalGenericResultType(String containerTypeName) {
return containerTypeName.equals(List.class.getName())
return containerTypeName.equals(Constants.LIST)
|| containerTypeName.equals(Constants.TYPED_QUERY)
|| containerTypeName.equals(Constants.HIB_QUERY)
|| containerTypeName.equals(Constants.HIB_SELECTION_QUERY);

4
tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java
View File

@ -27,6 +27,7 @@ import org.hibernate.jpamodelgen.util.Constants;
import org.checkerframework.checker.nullness.qual.Nullable;
import static org.hibernate.jpamodelgen.util.TypeUtils.isClassOrRecordType;
import static org.hibernate.jpamodelgen.util.NullnessUtil.castNonNull;
import static org.hibernate.jpamodelgen.util.StringUtil.isProperty;
import static org.hibernate.jpamodelgen.util.TypeUtils.DEFAULT_ANNOTATION_PARAMETER_NAME;
@ -306,7 +307,8 @@ class BasicAttributeVisitor extends SimpleTypeVisitor8<Boolean, Element> {
return true;
}
if ( element.getKind() == ElementKind.CLASS || element.getKind() == ElementKind.INTERFACE ) {
if ( isClassOrRecordType( element )
|| element.getKind() == ElementKind.INTERFACE ) {
final TypeElement typeElement = (TypeElement) element;
final String typeName = typeElement.getQualifiedName().toString();
if ( Constants.BASIC_TYPES.contains( typeName ) ) {

10
tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/util/TypeUtils.java
View File

@ -186,7 +186,8 @@ public final class TypeUtils {
public static boolean isAnnotationMirrorOfType(AnnotationMirror annotationMirror, String fqcn) {
assert annotationMirror != null;
assert fqcn != null;
return annotationMirror.getAnnotationType().toString().equals( fqcn );
final Element element = annotationMirror.getAnnotationType().asElement();
return ((TypeElement) element).getQualifiedName().contentEquals( fqcn );
}
/**
@ -455,6 +456,13 @@ public final class TypeUtils {
}
}
public static boolean isClassOrRecordType(Element element) {
final ElementKind kind = element.getKind();
// we want to accept classes and records but not enums,
// and we want to avoid depending on ElementKind.RECORD
return kind.isClass() && kind != ElementKind.ENUM;
}
static class EmbeddedAttributeVisitor extends SimpleTypeVisitor8<@Nullable String, Element> {
private final Context context;