Skip to content

deal with more casts #9215

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 1 commit into from
Nov 7, 2024
+23 −18
Merged

deal with more casts #9215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
import org.hibernate.query.spi.QueryParameterBindings;
import org.hibernate.query.spi.ScrollableResultsImplementor;
import org.hibernate.query.spi.SelectQueryPlan;
import org.hibernate.query.sqm.SqmPathSource;
import org.hibernate.query.sqm.internal.SqmInterpretationsKey.InterpretationsKeySource;
import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
import org.hibernate.query.sqm.spi.NamedSqmQueryMemento;
Expand Down
40 changes: 23 additions & 17 deletions hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*/
package org.hibernate.query.sqm.tree.select;

import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -40,6 +39,8 @@
import jakarta.persistence.criteria.Selection;
import jakarta.persistence.metamodel.EntityType;

import static java.util.Collections.emptySet;
import static java.util.Collections.unmodifiableSet;
import static org.hibernate.query.sqm.spi.SqmCreationHelper.combinePredicates;
import static org.hibernate.query.sqm.SqmQuerySource.CRITERIA;
import static org.hibernate.query.sqm.tree.SqmCopyContext.noParamCopyContext;
Expand Down Expand Up @@ -168,8 +169,8 @@ public SqmQuerySource getQuerySource() {
public SqmQuerySpec<T> getQuerySpec() {
if ( querySource == CRITERIA ) {
final SqmQueryPart<T> queryPart = getQueryPart();
if ( queryPart instanceof SqmQuerySpec<?> ) {
return (SqmQuerySpec<T>) queryPart;
if ( queryPart instanceof SqmQuerySpec<T> querySpec ) {
return querySpec;
}
throw new IllegalStateException(
"Query group can't be treated as query spec. Use JpaSelectCriteria#getQueryPart to access query group details"
Expand All @@ -185,8 +186,8 @@ public boolean producesUniqueResults() {
}

private boolean producesUniqueResults(SqmQueryPart<?> queryPart) {
if ( queryPart instanceof SqmQuerySpec<?> ) {
return ( (SqmQuerySpec<?>) queryPart ).producesUniqueResults();
if ( queryPart instanceof SqmQuerySpec<?> querySpec ) {
return querySpec.producesUniqueResults();
}
else {
// For query groups we have to assume that duplicates are possible
Expand All @@ -199,29 +200,33 @@ public boolean containsCollectionFetches() {
}

private boolean containsCollectionFetches(SqmQueryPart<?> queryPart) {
if ( queryPart instanceof SqmQuerySpec<?> ) {
return ( (SqmQuerySpec<?>) queryPart ).containsCollectionFetches();
if ( queryPart instanceof SqmQuerySpec<?> querySpec ) {
return querySpec.containsCollectionFetches();
}
else {
else if ( queryPart instanceof SqmQueryGroup<?> queryGroup ) {
// We only have to check the first one
final SqmQueryGroup<?> queryGroup = (SqmQueryGroup<?>) queryPart;
return containsCollectionFetches( queryGroup.getQueryParts().get( 0 ) );
}
else {
throw new IllegalStateException("No SqmQueryPart");
}
}

public boolean usesDistinct() {
return usesDistinct( getQueryPart() );
}

private boolean usesDistinct(SqmQueryPart<?> queryPart) {
if ( queryPart instanceof SqmQuerySpec<?> ) {
return ( (SqmQuerySpec<?>) queryPart ).getSelectClause().isDistinct();
if ( queryPart instanceof SqmQuerySpec<?> querySpec ) {
return querySpec.getSelectClause().isDistinct();
}
else {
else if ( queryPart instanceof SqmQueryGroup<?> queryGroup ) {
// We only have to check the first one
final SqmQueryGroup<?> queryGroup = (SqmQueryGroup<?>) queryPart;
return usesDistinct( queryGroup.getQueryParts().get( 0 ) );
}
else {
throw new IllegalStateException("No SqmQueryPart");
}
}

@Override
Expand All @@ -230,8 +235,9 @@ public Set<SqmParameter<?>> getSqmParameters() {
assert parameters == null : "SqmSelectStatement (as Criteria) should not have collected parameters";
return collectParameters( this );
}

return parameters == null ? Collections.emptySet() : Collections.unmodifiableSet( parameters );
else {
return parameters == null ? emptySet() : unmodifiableSet( parameters );
}
}

@Override
Expand All @@ -249,7 +255,6 @@ public void addParameter(SqmParameter<?> parameter) {
if ( parameters == null ) {
parameters = new LinkedHashSet<>();
}

parameters.add( parameter );
}

Expand All @@ -269,7 +274,8 @@ protected <X> JpaCteCriteria<X> withInternal(
String name,
AbstractQuery<X> baseCriteria,
boolean unionDistinct,
Function<JpaCteCriteria<X>, AbstractQuery<X>> recursiveCriteriaProducer) {
Function<JpaCteCriteria<X>,
AbstractQuery<X>> recursiveCriteriaProducer) {
if ( baseCriteria instanceof SqmSubQuery<?> ) {
throw new IllegalArgumentException(
"Invalid query type provided to root query 'with' method, " +
Expand Down
Loading