Skip to content

Commit 9f58d54

Browse files
committed
fix some unnecessary use of raw types
1 parent cb857b1 commit 9f58d54

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/JpaCriteriaParameter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ private String name(SqmRenderContext context) {
148148
}
149149

150150
@Override
151-
public int compareTo(SqmParameter parameter) {
152-
return parameter instanceof JpaCriteriaParameter
151+
public int compareTo(SqmParameter<T> parameter) {
152+
return parameter instanceof JpaCriteriaParameter<T>
153153
? Integer.compare( hashCode(), parameter.hashCode() )
154154
: 1;
155155
}

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJpaCriteriaParameterWrapper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ public void appendHqlString(StringBuilder hql, SqmRenderContext context) {
129129
}
130130

131131
@Override
132-
public int compareTo(SqmParameter anotherParameter) {
133-
return anotherParameter instanceof SqmJpaCriteriaParameterWrapper<?> wrapper
132+
public int compareTo(SqmParameter<T> parameter) {
133+
return parameter instanceof SqmJpaCriteriaParameterWrapper<T> wrapper
134134
? getJpaCriteriaParameter().compareTo( wrapper.getJpaCriteriaParameter() )
135135
: 1;
136136
}

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedParameter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ public void appendHqlString(StringBuilder hql, SqmRenderContext context) {
8383
}
8484

8585
@Override
86-
public int compareTo(SqmParameter anotherParameter) {
87-
return anotherParameter instanceof SqmNamedParameter<?> namedParameter
86+
public int compareTo(SqmParameter<T> parameter) {
87+
return parameter instanceof SqmNamedParameter<T> namedParameter
8888
? getName().compareTo( namedParameter.getName() )
8989
: -1;
9090
}

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameter.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,21 @@ public interface SqmParameter<T> extends SqmExpression<T>, JpaParameterExpressio
7575
* support any previous extensions
7676
*/
7777
@Override
78-
default int compareTo(SqmParameter<T> anotherParameter) {
79-
if ( this instanceof SqmNamedParameter<?> one ) {
80-
return anotherParameter instanceof SqmNamedParameter<?>
81-
? one.getName().compareTo( anotherParameter.getName() )
78+
default int compareTo(SqmParameter<T> parameter) {
79+
if ( this instanceof SqmNamedParameter<T> one ) {
80+
return parameter instanceof SqmNamedParameter<?>
81+
? one.getName().compareTo( parameter.getName() )
8282
: -1;
8383
}
84-
else if ( this instanceof SqmPositionalParameter<?> one ) {
85-
return anotherParameter instanceof SqmPositionalParameter<?>
86-
? one.getPosition().compareTo( anotherParameter.getPosition() )
84+
else if ( this instanceof SqmPositionalParameter<T> one ) {
85+
return parameter instanceof SqmPositionalParameter<?>
86+
? one.getPosition().compareTo( parameter.getPosition() )
8787
: 1;
8888
}
89-
else if ( this instanceof SqmJpaCriteriaParameterWrapper
90-
&& anotherParameter instanceof SqmJpaCriteriaParameterWrapper ) {
91-
return Integer.compare( this.hashCode(), anotherParameter.hashCode() );
89+
else if ( this instanceof SqmJpaCriteriaParameterWrapper<T>
90+
&& parameter instanceof SqmJpaCriteriaParameterWrapper<T> ) {
91+
return Integer.compare( this.hashCode(), parameter.hashCode() );
9292
}
93-
throw new HibernateException( "Unexpected SqmParameter type for comparison : " + this + " & " + anotherParameter );
93+
throw new HibernateException( "Unexpected SqmParameter type for comparison : " + this + " & " + parameter );
9494
}
9595
}

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmPositionalParameter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ public void appendHqlString(StringBuilder hql, SqmRenderContext context) {
8585
}
8686

8787
@Override
88-
public int compareTo(SqmParameter anotherParameter) {
89-
return anotherParameter instanceof SqmPositionalParameter<?> positionalParameter
88+
public int compareTo(SqmParameter<T> parameter) {
89+
return parameter instanceof SqmPositionalParameter<T> positionalParameter
9090
? getPosition().compareTo( positionalParameter.getPosition() )
9191
: 1;
9292
}

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/ValueBindJpaCriteriaParameter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void appendHqlString(StringBuilder hql, SqmRenderContext context) {
5151

5252
@Override
5353
// TODO: fix this
54-
public int compareTo(SqmParameter parameter) {
54+
public int compareTo(SqmParameter<T> parameter) {
5555
return this == parameter ? 0 : 1;
5656
}
5757

0 commit comments

Comments
 (0)