Skip to content

Commit a0a09bf

Browse files
committed
type inference in the SQM tree
fixed a method which depended on an unchecked cast
1 parent 2d71792 commit a0a09bf

File tree

118 files changed

+613
-610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+613
-610
lines changed

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPath.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ protected AnyDiscriminatorSqmPath(
2929

3030
@Override
3131
public AnyDiscriminatorSqmPath<T> copy(SqmCopyContext context) {
32-
final AnyDiscriminatorSqmPath<T> existing = context.getCopy( this );
32+
final var existing = context.getCopy( this );
3333
if ( existing != null ) {
3434
return existing;
3535
}

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public EmbeddableDomainType<T> getEmbeddableDomainType() {
5252

5353
@Override
5454
public EmbeddedDiscriminatorSqmPath<T> copy(SqmCopyContext context) {
55-
final EmbeddedDiscriminatorSqmPath<T> existing = context.getCopy( this );
55+
final var existing = context.getCopy( this );
5656
if ( existing != null ) {
5757
return existing;
5858
}

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public EntityMappingType getEntityDescriptor() {
6464

6565
@Override
6666
public EntityDiscriminatorSqmPath copy(SqmCopyContext context) {
67-
final EntityDiscriminatorSqmPath existing = context.getCopy( this );
67+
final var existing = context.getCopy( this );
6868
if ( existing != null ) {
6969
return existing;
7070
}

hibernate-core/src/main/java/org/hibernate/query/hql/internal/BasicDotIdentifierConsumer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,7 @@ private SemanticPathPart resolvePath(String identifier, boolean isTerminal, SqmC
198198
if ( pathRootByExposedNavigable != null ) {
199199
// identifier is an "unqualified attribute reference"
200200
validateAsRoot( pathRootByExposedNavigable );
201-
final SqmPath<?> sqmPath =
202-
pathRootByExposedNavigable.get( identifier, true );
201+
final var sqmPath = pathRootByExposedNavigable.get( identifier, true );
203202
return isTerminal ? sqmPath : new DomainPathPart( sqmPath );
204203
}
205204

hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPathConsumer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.hibernate.query.hql.spi.SemanticPathPart;
1111
import org.hibernate.query.hql.spi.SqmCreationProcessingState;
1212
import org.hibernate.query.hql.spi.SqmCreationState;
13-
import org.hibernate.query.hql.spi.SqmPathRegistry;
1413
import org.hibernate.query.sqm.SqmJoinable;
1514
import org.hibernate.query.sqm.SqmPathSource;
1615
import org.hibernate.query.sqm.spi.SqmCreationHelper;
@@ -124,7 +123,7 @@ public void consumeTreat(String entityName, boolean isTerminal) {
124123

125124
private ConsumerDelegate resolveBase(String identifier, boolean isTerminal) {
126125
final SqmCreationProcessingState processingState = creationState.getCurrentProcessingState();
127-
final SqmPathRegistry pathRegistry = processingState.getPathRegistry();
126+
final var pathRegistry = processingState.getPathRegistry();
128127
final SqmFrom<?, Object> pathRootByAlias = pathRegistry.findFromByAlias( identifier, true );
129128
if ( pathRootByAlias != null ) {
130129
return resolveAlias( identifier, isTerminal, pathRootByAlias );

hibernate-core/src/main/java/org/hibernate/query/hql/internal/QuerySplitter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ private static <S extends SqmStatement<?>> S copyStatement(
7878
final SqmCopyContext context = SqmCopyContext.noParamCopyContext();
7979
// Copy the statement replacing the root's unmapped polymorphic reference with
8080
// the concrete mapped descriptor entity domain type.
81-
final SqmRoot<?> path = context.registerCopy(
81+
final var path = context.registerCopy(
8282
unmappedPolymorphicReference,
8383
new SqmRoot<>(
8484
mappedDescriptor,

hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmAggregateFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public SelfRenderingSqmAggregateFunction(
4747

4848
@Override
4949
public SelfRenderingSqmAggregateFunction<T> copy(SqmCopyContext context) {
50-
final SelfRenderingSqmAggregateFunction<T> existing = context.getCopy( this );
50+
final var existing = context.getCopy( this );
5151
if ( existing != null ) {
5252
return existing;
5353
}

hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public SelfRenderingSqmFunction(
5959

6060
@Override
6161
public SelfRenderingSqmFunction<T> copy(SqmCopyContext context) {
62-
final SelfRenderingSqmFunction<T> existing = context.getCopy( this );
62+
final var existing = context.getCopy( this );
6363
if ( existing != null ) {
6464
return existing;
6565
}

hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmOrderedSetAggregateFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public SelfRenderingSqmOrderedSetAggregateFunction(
6363

6464
@Override
6565
public SelfRenderingSqmOrderedSetAggregateFunction<T> copy(SqmCopyContext context) {
66-
final SelfRenderingSqmOrderedSetAggregateFunction<T> existing = context.getCopy( this );
66+
final var existing = context.getCopy( this );
6767
if ( existing != null ) {
6868
return existing;
6969
}

hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmSetReturningFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public SelfRenderingSqmSetReturningFunction(
6363

6464
@Override
6565
public SelfRenderingSqmSetReturningFunction<T> copy(SqmCopyContext context) {
66-
final SelfRenderingSqmSetReturningFunction<T> existing = context.getCopy( this );
66+
final var existing = context.getCopy( this );
6767
if ( existing != null ) {
6868
return existing;
6969
}

0 commit comments

Comments
 (0)