Skip to content

Commit f32bb72

Browse files
committed
let a handwritten metamodel "override" the generated one
used in the JD TCK (ffff) Signed-off-by: Gavin King <[email protected]>
1 parent b755048 commit f32bb72

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,9 +485,14 @@ private void handleRootElementAnnotationMirrors(final Element element) {
485485
if ( context.generateJakartaDataStaticMetamodel()
486486
// no static metamodel for embeddable classes in Jakarta Data
487487
&& hasAnnotation( element, ENTITY, MAPPED_SUPERCLASS )
488-
// Don't generate a Jakarta Data metamodel
488+
// don't generate a Jakarta Data metamodel
489489
// if this entity was partially mapped in XML
490-
&& alreadyExistingMetaEntity == null ) {
490+
&& alreadyExistingMetaEntity == null
491+
// let a handwritten metamodel "override" the generated one
492+
// (this is used in the Jakarta Data TCK)
493+
&& element.getEnclosingElement().getEnclosedElements()
494+
.stream().noneMatch(e -> e.getSimpleName()
495+
.contentEquals('_' + element.getSimpleName().toString()))) {
491496
final AnnotationMetaEntity dataMetaEntity =
492497
AnnotationMetaEntity.create( typeElement, context,
493498
requiresLazyMemberInitialization,

0 commit comments

Comments
 (0)