From 3d0545e2a88fb3e44aaf96a239e63e4bc348950e Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Fri, 22 Nov 2024 13:07:38 +0000 Subject: [PATCH] HHH-18875 Avoid using the deprecated constructors of StandardStack --- .../hibernate/graph/internal/parse/GraphParser.java | 6 +++--- .../query/hql/internal/SemanticQueryBuilder.java | 5 ++--- .../internal/DomainResultCreationStateImpl.java | 2 +- .../query/sqm/sql/BaseSqmToSqlAstConverter.java | 12 ++++++------ .../sql/ast/spi/AbstractSqlAstTranslator.java | 6 +++--- .../sql/results/graph/DomainResultGraphPrinter.java | 2 +- .../org/hibernate/sql/results/spi/LoadContexts.java | 2 +- .../hibernate/orm/test/util/StandardStackTest.java | 2 +- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParser.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParser.java index 2c8d463a8a5a..5697f5bd3d78 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParser.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParser.java @@ -64,9 +64,9 @@ public static void parseInto( private final SessionFactoryImplementor sessionFactory; - private final Stack graphStack = new StandardStack<>( GraphImplementor.class ); - private final Stack attributeNodeStack = new StandardStack<>( AttributeNodeImplementor.class ); - private final Stack graphSourceStack = new StandardStack<>(SubGraphGenerator.class); + private final Stack graphStack = new StandardStack<>(); + private final Stack attributeNodeStack = new StandardStack<>(); + private final Stack graphSourceStack = new StandardStack<>(); public GraphParser(SessionFactoryImplementor sessionFactory) { this.sessionFactory = sessionFactory; diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java index 8500c7ffb3f7..fe3ea457f2ab 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java @@ -308,8 +308,8 @@ public static SqmStatement buildSemanticModel( private final Stack dotIdentifierConsumerStack; - private final Stack parameterDeclarationContextStack = new StandardStack<>( ParameterDeclarationContext.class ); - private final Stack processingStateStack = new StandardStack<>( SqmCreationProcessingState.class ); + private final Stack parameterDeclarationContextStack = new StandardStack<>(); + private final Stack processingStateStack = new StandardStack<>(); private final BasicDomainType integerDomainType; private final JavaType> listJavaType; @@ -382,7 +382,6 @@ private SemanticQueryBuilder( this.creationContext = creationContext; this.query = query; this.dotIdentifierConsumerStack = new StandardStack<>( - DotIdentifierConsumer.class, new BasicDotIdentifierConsumer( this ) ); this.parameterStyle = creationOptions.useStrictJpaCompliance() diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/DomainResultCreationStateImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/DomainResultCreationStateImpl.java index c7ee3c7740cf..e7e5f7d8b68b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/DomainResultCreationStateImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/DomainResultCreationStateImpl.java @@ -77,7 +77,7 @@ public class DomainResultCreationStateImpl private final LegacyFetchResolver legacyFetchResolver; private final SessionFactoryImplementor sessionFactory; - private final Stack fetchBuilderResolverStack = new StandardStack<>( Function.class, fetchableName -> null ); + private final Stack fetchBuilderResolverStack = new StandardStack<>( fetchableName -> null ); private Map registeredLockModes; private boolean processingKeyFetches = false; private boolean resolvingCircularFetch; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java index 6a9163094f5a..3bd91f0e97e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java @@ -488,7 +488,7 @@ public abstract class BaseSqmToSqlAstConverter extends Base private boolean deduplicateSelectionItems; private ForeignKeyDescriptor.Nature currentlyResolvingForeignKeySide; private SqmStatement currentSqmStatement; - private Stack sqmQueryPartStack = new StandardStack<>( SqmQueryPart.class ); + private Stack sqmQueryPartStack = new StandardStack<>(); private CteContainer cteContainer; /** * A map from {@link SqmCteTable#getCteName()} to the final SQL name. @@ -506,8 +506,8 @@ public abstract class BaseSqmToSqlAstConverter extends Base private List> orderByFragments; private final SqlAliasBaseManager sqlAliasBaseManager = new SqlAliasBaseManager(); - private final Stack processingStateStack = new StandardStack<>( SqlAstProcessingState.class ); - private final Stack fromClauseIndexStack = new StandardStack<>( FromClauseIndex.class ); + private final Stack processingStateStack = new StandardStack<>(); + private final Stack fromClauseIndexStack = new StandardStack<>(); // Captures all entity name uses under which a table group is being used within the current conjunct. // Outside a top level conjunct, it represents the "global uses" i.e. select, from, group and order by clauses. @@ -521,9 +521,9 @@ public abstract class BaseSqmToSqlAstConverter extends Base private SqmJoin currentlyProcessingJoin; protected Predicate additionalRestrictions; - private final Stack currentClauseStack = new StandardStack<>( Clause.class ); - private final Stack inferrableTypeAccessStack = new StandardStack<>( Supplier.class ); - private final Stack queryTransformers = new StandardStack<>( List.class ); + private final Stack currentClauseStack = new StandardStack<>(); + private final Stack inferrableTypeAccessStack = new StandardStack<>(); + private final Stack queryTransformers = new StandardStack<>(); private boolean inTypeInference; private boolean inImpliedResultTypeInference; private boolean inNestedContext; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java index 516ab521f286..d9096e88e556 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java @@ -304,9 +304,9 @@ public abstract class AbstractSqlAstTranslator implemen private final ParameterMarkerStrategy parameterMarkerStrategy; - private final Stack clauseStack = new StandardStack<>( Clause.class ); - private final Stack queryPartStack = new StandardStack<>( QueryPart.class ); - private final Stack statementStack = new StandardStack<>( Statement.class ); + private final Stack clauseStack = new StandardStack<>(); + private final Stack queryPartStack = new StandardStack<>(); + private final Stack statementStack = new StandardStack<>(); private final Dialect dialect; private final Set affectedTableNames = new HashSet<>(); diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphPrinter.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphPrinter.java index dd272270a0b7..3a50c6629b45 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphPrinter.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphPrinter.java @@ -45,7 +45,7 @@ public static void logDomainResultGraph(String header, List> dom } private final StringBuilder buffer; - private final Stack fetchParentStack = new StandardStack<>( FetchParent.class ); + private final Stack fetchParentStack = new StandardStack<>(); private DomainResultGraphPrinter(String header) { buffer = new StringBuilder( header + ":" + System.lineSeparator() ); diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/LoadContexts.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/LoadContexts.java index 90dc0738fd5d..44a95421d23b 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/LoadContexts.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/LoadContexts.java @@ -24,7 +24,7 @@ public class LoadContexts { private static final CoreMessageLogger log = CoreLogging.messageLogger( LoadContexts.class ); private final PersistenceContext persistenceContext; - private final StandardStack jdbcValuesSourceProcessingStateStack = new StandardStack<>( JdbcValuesSourceProcessingState.class ); + private final StandardStack jdbcValuesSourceProcessingStateStack = new StandardStack<>(); public LoadContexts(PersistenceContext persistenceContext) { this.persistenceContext = persistenceContext; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/StandardStackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/StandardStackTest.java index 8de2c1b92525..7a9bb2fe20fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/StandardStackTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/StandardStackTest.java @@ -146,7 +146,7 @@ public void testFindCurrentFirstWithParameterCleared() { // utility functions private Stack allocateStack(int size) { - final Stack stack = new StandardStack<>( Integer.class ); + final Stack stack = new StandardStack<>(); for ( int i = 0; i < size; i++ ) { stack.push( i ); }