HHH-17612 Annotated envers supertype as @Entity instead of superclass

Author: mbellade

hibernate-envers/src/main/java/org/hibernate/envers/DefaultTrackingModifiedEntitiesRevisionEntity.java

@@ -11,8 +11,8 @@
 import jakarta.persistence.FetchType;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.JoinTable;
-import jakarta.persistence.MappedSuperclass;
 
+import jakarta.persistence.MappedSuperclass;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 

hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java

@@ -34,8 +34,7 @@ protected void addConfigOptions(Map options) {
 	@Override
 	protected Class<?>[] getAnnotatedClasses() {
 		return new Class<?>[] {
-				StrTestEntity.class, ListOwnedEntity.class, ListOwningEntity.class,
-				getRevisionEntityClass()
+				StrTestEntity.class, ListOwnedEntity.class, ListOwningEntity.class
 		};
 	}
 

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

@@ -34,18 +34,31 @@ public boolean hasStringAttribute() {
 
 	@Override
 	public String getAttributeDeclarationString() {
+		final String qualifiedName = annotationMetaEntity.getQualifiedName();
 		return new StringBuilder()
 				.append("\n/**\n * @see ")
-				.append( annotationMetaEntity.getQualifiedName() )
+				.append( qualifiedName )
 				.append( "\n **/\n" )
 				.append("public static volatile ")
-				.append(annotationMetaEntity.importType(getTypeDeclaration()))
+				.append(annotationMetaEntity.importType(adjustedTypeDeclaration(qualifiedName)))
 				.append("<")
-				.append(annotationMetaEntity.importType(annotationMetaEntity.getQualifiedName()))
+				.append(annotationMetaEntity.importType(qualifiedName))
 				.append(">")
 				.append(" class_;").toString();
 	}
 
+	private String adjustedTypeDeclaration(String qualifiedName) {
+		if ( qualifiedName.startsWith( "org.hibernate.envers" ) ) {
+			// This is a workaround for envers default revision entities which must be annotated
+			// @MappedSuperclass to allow for custom revision entities extending them,
+			// but if used by default are contributed (as hbm.xml mappings) as entities
+			return "jakarta.persistence.metamodel.EntityType";
+		}
+		else {
+			return getTypeDeclaration();
+		}
+	}
+
 	@Override
 	public String getAttributeNameDeclarationString() {
 		throw new UnsupportedOperationException("operation not supported");