HHH-18137 private fields inherited from supertypes in HibernateProcessor

Elements.getAllMembers() does not do what it appears to do

Signed-off-by: Gavin King <gavin@hibernate.org>

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

@@ -17,7 +17,11 @@ import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 import javax.tools.Diagnostic;
@@ -448,4 +452,35 @@ public final class Context {
 			|| pattern.startsWith("*") && name.endsWith( pattern.substring(1) )
 			|| pattern.startsWith("*") && pattern.endsWith("*") && name.contains( pattern.substring(1, pattern.length()-1) );
 	}
+
+	public List<Element> getAllMembers(TypeElement type) {
+		final List<? extends Element> elements = type.getEnclosedElements();
+		final List<Element> list = new ArrayList<>(elements);
+		final TypeMirror superclass = type.getSuperclass();
+		if ( superclass.getKind() == TypeKind.DECLARED ) {
+			final DeclaredType declaredType = (DeclaredType) superclass;
+			final TypeElement typeElement = (TypeElement) declaredType.asElement();
+			for ( Element inherited : getAllMembers(typeElement) ) {
+				if ( notOverridden(type, inherited, elements) ) {
+					list.add( inherited );
+				}
+			}
+		}
+		for (TypeMirror supertype : type.getInterfaces()) {
+			final DeclaredType declaredType = (DeclaredType) supertype;
+			final TypeElement typeElement = (TypeElement) declaredType.asElement();
+			for ( Element inherited : getAllMembers(typeElement) ) {
+				if ( notOverridden(type, inherited, elements) ) {
+					list.add( inherited );
+				}
+			}
+		}
+		return list;
+	}
+
+	private boolean notOverridden(TypeElement type, Element inherited, List<? extends Element> elements) {
+		return !(inherited instanceof ExecutableElement)
+			|| elements.stream().noneMatch(member -> member instanceof ExecutableElement
+				&& getElementUtils().overrides((ExecutableElement) member, (ExecutableElement) inherited, type));
+	}
 }

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

@@ -381,7 +381,7 @@ public class AnnotationMetaEntity extends AnnotationMeta {
 
 		if ( repository ) {
 			final List<ExecutableElement> methodsOfClass =
-					methodsIn( context.getElementUtils().getAllMembers(element) );
+					methodsIn( context.getAllMembers(element) );
 			for ( ExecutableElement method: methodsOfClass ) {
 				if ( containsAnnotation( method, HQL, SQL, JD_QUERY, FIND, JD_FIND ) ) {
 					queryMethods.add( method );
@@ -1004,7 +1004,7 @@ public class AnnotationMetaEntity extends AnnotationMeta {
 			}
 			final AnnotationValue annotationVal =
 					castNonNull(getAnnotationValue(annotation, "mappedBy"));
-			for ( Element member : context.getElementUtils().getAllMembers(assocTypeElement) ) {
+			for ( Element member : context.getAllMembers(assocTypeElement) ) {
 				if ( propertyName(this, member).contentEquals(mappedBy) ) {
 					validateBackRef(memberOfClass, annotation, assocTypeElement, member, annotationVal);
 					return;
@@ -2127,7 +2127,7 @@ public class AnnotationMetaEntity extends AnnotationMeta {
 	private @Nullable Element memberMatchingPath(TypeElement entityType, StringTokenizer tokens) {
 		final AccessType accessType = getAccessType(entityType);
 		final String nextToken = tokens.nextToken();
-		for ( Element member : context.getElementUtils().getAllMembers(entityType) ) {
+		for ( Element member : context.getAllMembers(entityType) ) {
 			if ( isIdRef(nextToken) && hasAnnotation( member, ID) ) {
 				return member;
 			}

tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/Child.java

@@ -0,0 +1,7 @@
+package org.hibernate.processor.test.mappedsuperclass.dao;
+
+import jakarta.persistence.Entity;
+
+@Entity
+public class Child extends Parent {
+}

tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/DaoTest.java

@@ -0,0 +1,30 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.processor.test.mappedsuperclass.dao;
+
+import org.hibernate.processor.test.util.CompilationTest;
+import org.hibernate.processor.test.util.TestUtil;
+import org.hibernate.processor.test.util.WithClasses;
+import org.junit.Test;
+
+import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
+
+/**
+ * @author Gavin King
+ */
+public class DaoTest extends CompilationTest {
+	@Test
+	@WithClasses({ Parent.class, Child.class, Queries.class })
+	public void testDao() {
+		System.out.println( TestUtil.getMetaModelSourceAsString( Queries.class ) );
+		System.out.println( TestUtil.getMetaModelSourceAsString( Parent.class ) );
+		System.out.println( TestUtil.getMetaModelSourceAsString( Child.class ) );
+		assertMetamodelClassGeneratedFor( Queries.class );
+		assertMetamodelClassGeneratedFor( Parent.class );
+		assertMetamodelClassGeneratedFor( Child.class );
+	}
+}

tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/Parent.java

@@ -0,0 +1,18 @@
+package org.hibernate.processor.test.mappedsuperclass.dao;
+
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public abstract class Parent {
+	@Id
+	private Long id;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+}

tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/mappedsuperclass/dao/Queries.java

@@ -0,0 +1,8 @@
+package org.hibernate.processor.test.mappedsuperclass.dao;
+
+import org.hibernate.annotations.processing.Find;
+
+public interface Queries {
+	@Find
+	Child getChild(Long id);
+}