Skip to content

Commit dfc282a

Browse files
committed
extremely minor cleanups to type descriptors
1 parent e83008e commit dfc282a

19 files changed

+61
-62
lines changed

hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.hibernate.type.descriptor.java.CoercionException;
2323
import org.hibernate.type.descriptor.java.JavaType;
2424
import org.hibernate.type.descriptor.java.JavaTypeHelper;
25-
import org.hibernate.type.descriptor.java.TemporalJavaType;
2625
import org.hibernate.type.spi.TypeConfiguration;
2726

2827
import jakarta.persistence.TemporalType;
@@ -118,7 +117,7 @@ else if ( queryParameter.getHibernateType() != null ) {
118117
catch (CoercionException ce) {
119118
throw new IllegalArgumentException(
120119
String.format(
121-
"Parameter value [%s] did not match expected type [%s ]",
120+
"Parameter value [%s] did not match expected type [%s]",
122121
value,
123122
bindType
124123
),

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.hibernate.query.sqm.tree.AbstractSqmNode;
1414
import org.hibernate.query.sqm.tree.SqmCopyContext;
1515
import org.hibernate.query.sqm.tree.SqmTypedNode;
16-
import org.hibernate.query.sqm.tree.SqmVisitableNode;
1716

1817

1918
/**
@@ -81,12 +80,12 @@ public ReturnableType<T> getType() {
8180
}
8281

8382
@Override
84-
public <T> T accept(SemanticQueryWalker<T> walker) {
83+
public <X> X accept(SemanticQueryWalker<X> walker) {
8584
return walker.visitCastTarget(this);
8685
}
8786

8887
@Override
89-
public SqmExpressible getNodeType() {
88+
public SqmExpressible<T> getNodeType() {
9089
return type;
9190
}
9291

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,12 @@ public BooleanJavaType(char characterValueTrue, char characterValueFalse) {
4444
stringValueTrue = String.valueOf( characterValueTrue );
4545
stringValueFalse = String.valueOf( characterValueFalse );
4646
}
47+
4748
@Override
4849
public String toString(Boolean value) {
4950
return value == null ? null : value.toString();
5051
}
52+
5153
@Override
5254
public Boolean fromString(CharSequence string) {
5355
return Boolean.valueOf( string.toString() );
@@ -95,6 +97,7 @@ public <X> X unwrap(Boolean value, Class<X> type, WrapperOptions options) {
9597
}
9698
throw unknownUnwrap( type );
9799
}
100+
98101
@Override
99102
public <X> Boolean wrap(X value, WrapperOptions options) {
100103
if ( value == null ) {
@@ -117,10 +120,7 @@ public <X> Boolean wrap(X value, WrapperOptions options) {
117120
}
118121

119122
private boolean isTrue(String strValue) {
120-
if (strValue != null && !strValue.isEmpty()) {
121-
return isTrue(strValue.charAt(0));
122-
}
123-
return false;
123+
return strValue != null && !strValue.isEmpty() && isTrue( strValue.charAt(0) );
124124
}
125125

126126
private boolean isTrue(char charValue) {

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteJavaType.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public ByteJavaType() {
3535
public String toString(Byte value) {
3636
return value == null ? null : value.toString();
3737
}
38+
3839
@Override
3940
public Byte fromString(CharSequence string) {
4041
return Byte.valueOf( string.toString() );
@@ -175,6 +176,7 @@ public <X> Byte coerce(X value, CoercionContext coercionContext) {
175176
)
176177
);
177178
}
179+
178180
@Override
179181
public Byte next(
180182
Byte current,
@@ -188,7 +190,9 @@ public Byte next(
188190
@Override
189191
public Byte seed(
190192
Long length,
191-
Integer precision, Integer scale, SharedSessionContractImplementor session) {
193+
Integer precision,
194+
Integer scale,
195+
SharedSessionContractImplementor session) {
192196
return ZERO;
193197
}
194198

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,18 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
4242
return context.getJdbcType( Types.DATE );
4343
}
4444

45-
@Override
45+
@Override @SuppressWarnings("unchecked")
4646
protected <X> TemporalJavaType<X> forDatePrecision(TypeConfiguration typeConfiguration) {
47-
//noinspection unchecked
4847
return (TemporalJavaType<X>) this;
4948
}
5049

51-
@Override
50+
@Override @SuppressWarnings("unchecked")
5251
protected <X> TemporalJavaType<X> forTimestampPrecision(TypeConfiguration typeConfiguration) {
53-
//noinspection unchecked
5452
return (TemporalJavaType<X>) CalendarJavaType.INSTANCE;
5553
}
5654

57-
@Override
55+
@Override @SuppressWarnings("unchecked")
5856
protected <X> TemporalJavaType<X> forTimePrecision(TypeConfiguration typeConfiguration) {
59-
//noinspection unchecked
6057
return (TemporalJavaType<X>) CalendarTimeJavaType.INSTANCE;
6158
}
6259

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,18 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
5151
return context.getJdbcType( Types.TIMESTAMP );
5252
}
5353

54-
@Override
54+
@Override @SuppressWarnings("unchecked")
5555
protected <X> TemporalJavaType<X> forTimestampPrecision(TypeConfiguration typeConfiguration) {
56-
//noinspection unchecked
5756
return (TemporalJavaType<X>) this;
5857
}
5958

60-
@Override
59+
@Override @SuppressWarnings("unchecked")
6160
protected <X> TemporalJavaType<X> forDatePrecision(TypeConfiguration typeConfiguration) {
62-
//noinspection unchecked
6361
return (TemporalJavaType<X>) CalendarDateJavaType.INSTANCE;
6462
}
6563

66-
@Override
64+
@Override @SuppressWarnings("unchecked")
6765
protected <X> TemporalJavaType<X> forTimePrecision(TypeConfiguration typeConfiguration) {
68-
//noinspection unchecked
6966
return (TemporalJavaType<X>) CalendarTimeJavaType.INSTANCE;
7067
}
7168

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeJavaType.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,18 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
4242
return context.getJdbcType( Types.TIME );
4343
}
4444

45-
@Override
45+
@Override @SuppressWarnings("unchecked")
4646
protected <X> TemporalJavaType<X> forTimePrecision(TypeConfiguration typeConfiguration) {
47-
//noinspection unchecked
4847
return (TemporalJavaType<X>) this;
4948
}
5049

51-
@Override
50+
@Override @SuppressWarnings("unchecked")
5251
protected <X> TemporalJavaType<X> forTimestampPrecision(TypeConfiguration typeConfiguration) {
53-
//noinspection unchecked
5452
return (TemporalJavaType<X>) CalendarJavaType.INSTANCE;
5553
}
5654

57-
@Override
55+
@Override @SuppressWarnings("unchecked")
5856
protected <X> TemporalJavaType<X> forDatePrecision(TypeConfiguration typeConfiguration) {
59-
//noinspection unchecked
6057
return (TemporalJavaType<X>) CalendarDateJavaType.INSTANCE;
6158
}
6259

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterJavaType.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public class CharacterJavaType extends AbstractClassJavaType<Character> implemen
2424
public CharacterJavaType() {
2525
super( Character.class );
2626
}
27+
2728
@Override
2829
public String toString(Character value) {
2930
return value.toString();
@@ -50,10 +51,11 @@ public <X> X unwrap(Character value, Class<X> type, WrapperOptions options) {
5051
return (X) value.toString();
5152
}
5253
if ( Number.class.isAssignableFrom( type ) ) {
53-
return (X) Short.valueOf( (short)value.charValue() );
54+
return (X) Short.valueOf( (short) value.charValue() );
5455
}
5556
throw unknownUnwrap( type );
5657
}
58+
5759
@Override
5860
public <X> Character wrap(X value, WrapperOptions options) {
5961
if ( value == null ) {
@@ -77,7 +79,7 @@ public <X> Character wrap(X value, WrapperOptions options) {
7779
}
7880

7981
@Override
80-
public Class getPrimitiveClass() {
82+
public Class<?> getPrimitiveClass() {
8183
return char.class;
8284
}
8385

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DateJavaType.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,18 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
6060
return context.getJdbcType( Types.TIMESTAMP );
6161
}
6262

63-
@Override
63+
@Override @SuppressWarnings("unchecked")
6464
protected <X> TemporalJavaType<X> forDatePrecision(TypeConfiguration typeConfiguration) {
65-
//noinspection unchecked
6665
return (TemporalJavaType<X>) JdbcDateJavaType.INSTANCE;
6766
}
6867

69-
@Override
68+
@Override @SuppressWarnings("unchecked")
7069
protected <X> TemporalJavaType<X> forTimestampPrecision(TypeConfiguration typeConfiguration) {
71-
//noinspection unchecked
7270
return (TemporalJavaType<X>) JdbcTimestampJavaType.INSTANCE;
7371
}
7472

75-
@Override
73+
@Override @SuppressWarnings("unchecked")
7674
protected <X> TemporalJavaType<X> forTimePrecision(TypeConfiguration typeConfiguration) {
77-
//noinspection unchecked
7875
return (TemporalJavaType<X>) JdbcTimeJavaType.INSTANCE;
7976
}
8077

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoubleJavaType.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators indicators) {
3939
public String toString(Double value) {
4040
return value == null ? null : value.toString();
4141
}
42+
4243
@Override
4344
public Double fromString(CharSequence string) {
4445
return Double.valueOf( string.toString() );
@@ -79,6 +80,7 @@ public <X> X unwrap(Double value, Class<X> type, WrapperOptions options) {
7980
}
8081
throw unknownUnwrap( type );
8182
}
83+
8284
@Override
8385
public <X> Double wrap(X value, WrapperOptions options) {
8486
if ( value == null ) {
@@ -117,9 +119,8 @@ public boolean isWider(JavaType<?> javaType) {
117119
}
118120
}
119121

120-
@SuppressWarnings("rawtypes")
121122
@Override
122-
public Class getPrimitiveClass() {
123+
public Class<?> getPrimitiveClass() {
123124
return double.class;
124125
}
125126

0 commit comments

Comments
 (0)