HHH-19979 handle @NamedEntityGraph with defaulted name

Author: gavinking

tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMeta.java

@@ -25,6 +25,8 @@
 import static org.hibernate.processor.util.Constants.ENTITY_GRAPH;
 import static org.hibernate.processor.util.Constants.HIB_ENABLED_FETCH_PROFILE;
 import static org.hibernate.processor.util.Constants.JAVA_OBJECT;
+import static org.hibernate.processor.util.Constants.NAMED_ENTITY_GRAPH;
+import static org.hibernate.processor.util.Constants.NAMED_ENTITY_GRAPHS;
 import static org.hibernate.processor.util.Constants.NAMED_QUERY;
 import static org.hibernate.processor.util.Constants.TYPED_QUERY_REFERENCE;
 import static org.hibernate.processor.util.TypeUtils.containsAnnotation;
@@ -42,7 +44,7 @@ void addAuxiliaryMembers() {
 		addAuxiliaryMembersForAnnotation( Constants.SQL_RESULT_SET_MAPPING, "MAPPING_" );
 		addAuxiliaryMembersForRepeatableAnnotation( Constants.SQL_RESULT_SET_MAPPINGS, "MAPPING_" );
 		addAuxiliaryMembersForAnnotation( Constants.NAMED_ENTITY_GRAPH, "GRAPH_" );
-		addAuxiliaryMembersForRepeatableAnnotation( Constants.NAMED_ENTITY_GRAPHS, "GRAPH_" );
+		addAuxiliaryMembersForRepeatableAnnotation( NAMED_ENTITY_GRAPHS, "GRAPH_" );
 
 		addAuxiliaryMembersForAnnotation( Constants.HIB_NAMED_QUERY, "QUERY_" );
 		addAuxiliaryMembersForRepeatableAnnotation( Constants.HIB_NAMED_QUERIES, "QUERY_" );
@@ -156,7 +158,7 @@ private void addAuxiliaryMembersForRepeatableAnnotation(String annotationName, S
 				final List<? extends AnnotationValue> annotationValues =
 						(List<? extends AnnotationValue>) value.getValue();
 				for ( AnnotationValue annotationValue : annotationValues ) {
-					addAuxiliaryMembersForMirror( (AnnotationMirror) annotationValue.getValue(), prefix );
+					addAuxiliaryMembersForMirror( (AnnotationMirror) annotationValue.getValue(), prefix, annotationName );
 				}
 			}
 		}
@@ -165,21 +167,32 @@ private void addAuxiliaryMembersForRepeatableAnnotation(String annotationName, S
 	private void addAuxiliaryMembersForAnnotation(String annotationName, String prefix) {
 		final AnnotationMirror mirror = getAnnotationMirror( getElement(), annotationName );
 		if ( mirror != null ) {
-			addAuxiliaryMembersForMirror( mirror, prefix );
+			addAuxiliaryMembersForMirror( mirror, prefix, annotationName );
 		}
 	}
 
-	private void addAuxiliaryMembersForMirror(AnnotationMirror mirror, String prefix) {
+	private void addAuxiliaryMembersForMirror(AnnotationMirror mirror, String prefix, String annotationName) {
 		if ( !isJakartaDataStyle() ) {
-			mirror.getElementValues().forEach((key, value) -> {
-				if ( key.getSimpleName().contentEquals("name") ) {
-					final String name = value.getValue().toString();
-					if ( !name.isEmpty() ) {
-						putMember( prefix + name, auxiliaryMember( mirror, prefix, name ) );
-					}
-				}
-			});
+			final String name = defaultImplicitName( annotationName, explicitName( mirror ) );
+			putMember( prefix + name, auxiliaryMember( mirror, prefix, name ) );
+		}
+	}
+
+	private static String explicitName(AnnotationMirror mirror) {
+		for ( var entry : mirror.getElementValues().entrySet() ) {
+			if ( entry.getKey().getSimpleName().contentEquals( "name" ) ) {
+				return entry.getValue().getValue().toString();
+			}
 		}
+		return "";
+	}
+
+	private String defaultImplicitName(String annotationName, String explicitName) {
+		return explicitName.isEmpty()
+			&& ( NAMED_ENTITY_GRAPH.equals( annotationName )
+					|| NAMED_ENTITY_GRAPHS.equals( annotationName ) )
+				? getSimpleName()
+				: explicitName;
 	}
 
 	private NameMetaAttribute auxiliaryMember(AnnotationMirror mirror, String prefix, String name) {

tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/AuxiliaryTest.java

@@ -98,7 +98,22 @@ void test() {
 		assertPresenceOfNameFieldInMetamodelFor(
 				Book.class,
 				"GRAPH_ENTITY_GRAPH",
-				"Missing fetch profile attribute."
+				"Missing graph attribute."
+		);
+		assertPresenceOfFieldInMetamodelFor(
+				Book.class,
+				"_entityGraph",
+				"Missing graph attribute."
+		);
+		assertPresenceOfNameFieldInMetamodelFor(
+				Book.class,
+				"GRAPH_BOOK",
+				"Missing defaulted graph attribute."
+		);
+		assertPresenceOfFieldInMetamodelFor(
+				Book.class,
+				"_Book",
+				"Missing defaulted graph attribute."
 		);
 		assertPresenceOfMethodInMetamodelFor(
 				Book.class,

tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Book.java

@@ -6,11 +6,13 @@
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
+import jakarta.persistence.NamedAttributeNode;
 import jakarta.persistence.NamedEntityGraph;
 import jakarta.persistence.NamedQuery;
 
 @Entity
 @NamedEntityGraph(name = "entityGraph")
+@NamedEntityGraph(attributeNodes = @NamedAttributeNode("text"))
 @NamedQuery(name="booksByTitle",
 		query = "from Book where title = ?1")
 @NamedQuery(name="booksByTitleVerbose",