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

Author: mbellade

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

@@ -70,6 +70,12 @@ else if ( hasAnnotation(annotationMetaEntity.getElement(), Constants.EMBEDDABLE)
 			return "jakarta.persistence.metamodel.EmbeddableType";
 		}
 		else if ( hasAnnotation(annotationMetaEntity.getElement(), Constants.MAPPED_SUPERCLASS) ) {
+			if ( annotationMetaEntity.getQualifiedName().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";
+			}
 			return "jakarta.persistence.metamodel.MappedSuperclassType";
 		}
 		else {