From bc8fb2b37651051622aa02e59ff2247907ba3a34 Mon Sep 17 00:00:00 2001 From: Gavin King Date: Thu, 5 Dec 2024 17:13:50 +0100 Subject: [PATCH 1/2] remove unnecessary code cc @cigaly --- .../processor/annotation/AnnotationMetaEntity.java | 9 ++------- .../processor/annotation/NonManagedMetamodel.java | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java index a3f975e836b7..6e4baf9ec4d3 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java @@ -111,7 +111,6 @@ public class AnnotationMetaEntity extends AnnotationMeta { private final ImportContext importContext; private final TypeElement element; private final Map members; - private TypeElement parentElement; private final Context context; private final boolean managed; private boolean jakartaDataRepository; @@ -188,7 +187,6 @@ public static AnnotationMetaEntity create( final AnnotationMetaEntity annotationMetaEntity = new AnnotationMetaEntity( element, context, managed, jakartaData, parent ); if ( parent != null ) { - annotationMetaEntity.setParentElement( parent.element ); parent.addInnerClass( annotationMetaEntity ); } if ( !lazilyInitialised ) { @@ -267,11 +265,8 @@ public List getMembers() { } public void addInnerClass(AnnotationMetaEntity metaEntity) { - putMember( "INNER_" + metaEntity.getQualifiedName(), new InnerClassMetaAttribute( metaEntity ) ); - } - - public void setParentElement(TypeElement parentElement) { - this.parentElement = parentElement; + putMember( "INNER_" + metaEntity.getQualifiedName(), + new InnerClassMetaAttribute( metaEntity ) ); } @Override diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NonManagedMetamodel.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NonManagedMetamodel.java index d3129af10c93..df60a9d0a4fb 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NonManagedMetamodel.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NonManagedMetamodel.java @@ -22,7 +22,6 @@ public static NonManagedMetamodel create( final NonManagedMetamodel metamodel = new NonManagedMetamodel( element, context, jakartaDataStaticMetamodel, parent ); if ( parent != null ) { - metamodel.setParentElement( parent.getElement() ); parent.addInnerClass( metamodel ); } return metamodel; From 659f07e5848aaea8d0a7671e6e14bbc420d5ba95 Mon Sep 17 00:00:00 2001 From: Gavin King Date: Thu, 5 Dec 2024 17:21:21 +0100 Subject: [PATCH 2/2] fix two warnings --- .../processor/annotation/AnnotationMetaEntity.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java index 6e4baf9ec4d3..18979638dff7 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java @@ -2234,11 +2234,8 @@ private void addQueryMethod( } final AnnotationValue value = getAnnotationValue( mirror, "value" ); - if ( value != null ) { - final Object queryString = value.getValue(); - if ( queryString instanceof String ) { - addQueryMethod(method, returnType, containerTypeName, mirror, isNative, value, (String) queryString); - } + if ( value != null && value.getValue() instanceof String queryString ) { + addQueryMethod( method, returnType, containerTypeName, mirror, isNative, value, queryString ); } } @@ -2388,8 +2385,7 @@ else if ( isInsertUpdateDelete(hql) ) { else { final HqlLexer hqlLexer = HqlParseTreeBuilder.INSTANCE.buildHqlLexer( hql ); final List allTokens = hqlLexer.getAllTokens(); - for (int i = 0; i < allTokens.size(); i++) { - final Token token = allTokens.get(i); + for ( final Token token : allTokens ) { switch ( token.getType() ) { case FROM: return hql; @@ -2449,8 +2445,8 @@ private void validateHql( context.getEntityNameMappings(), context.getEnumTypesByValue(), context.isIndexing() ) ); if ( statement != null ) { - if ( statement instanceof SqmSelectStatement ) { - validateSelectHql( method, returnType, mirror, value, (SqmSelectStatement) statement ); + if ( statement instanceof SqmSelectStatement selectStatement ) { + validateSelectHql( method, returnType, mirror, value, selectStatement ); } else { validateUpdateHql( method, returnType, mirror, value );