Skip to content

remove unnecessary code #9378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 5, 2024
Merged

remove unnecessary code #9378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc8fb2b
remove unnecessary code
gavinking Dec 5, 2024
659f07e
fix two warnings
gavinking Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions ...odel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ public class AnnotationMetaEntity extends AnnotationMeta {
private final ImportContext importContext;
private final TypeElement element;
private final Map<String, MetaAttribute> members;
private TypeElement parentElement;
private final Context context;
private final boolean managed;
private boolean jakartaDataRepository;
Expand Down Expand Up @@ -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 ) {
Expand Down Expand Up @@ -267,11 +265,8 @@ public List<MetaAttribute> 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
Expand Down Expand Up @@ -2239,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 );
}
}

Expand Down Expand Up @@ -2393,8 +2385,7 @@ else if ( isInsertUpdateDelete(hql) ) {
else {
final HqlLexer hqlLexer = HqlParseTreeBuilder.INSTANCE.buildHqlLexer( hql );
final List<? extends Token> 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;
Expand Down Expand Up @@ -2454,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 );
Expand Down
1 change: 0 additions & 1 deletion ...model-generator/src/main/java/org/hibernate/processor/annotation/NonManagedMetamodel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading