Skip to content

Commit 4330fb7

Browse files
committed
eliminate some unnecessary overrides in JavaTypes
1 parent d4b83dd commit 4330fb7

File tree

9 files changed

+7
-58
lines changed

9 files changed

+7
-58
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ default JdbcType getRecommendedJdbcType(JdbcTypeIndicators indicators) {
3434

3535
@Override
3636
default T fromString(CharSequence string) {
37-
throw new UnsupportedOperationException();
37+
throw new UnsupportedOperationException( "Type " + getTypeName()
38+
+ " does not support conversion from String");
3839
}
3940
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public String toString(Calendar value) {
6060
}
6161

6262
public Calendar fromString(CharSequence string) {
63-
Calendar result = new GregorianCalendar();
63+
final var result = new GregorianCalendar();
6464
result.setTime( JdbcDateJavaType.INSTANCE.fromString( string.toString() ) );
6565
return result;
6666
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public String toString(Calendar value) {
6969
}
7070

7171
public Calendar fromString(CharSequence string) {
72-
Calendar result = new GregorianCalendar();
72+
final var result = new GregorianCalendar();
7373
result.setTime( DateJavaType.INSTANCE.fromString( string.toString() ) );
7474
return result;
7575
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public String toString(Calendar value) {
6060
}
6161

6262
public Calendar fromString(CharSequence string) {
63-
Calendar result = new GregorianCalendar();
63+
final var result = new GregorianCalendar();
6464
result.setTime( JdbcTimeJavaType.INSTANCE.fromString( string.toString() ) );
6565
return result;
6666
}

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,6 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
6767
);
6868
}
6969

70-
@Override
71-
public String toString(T value) {
72-
return value.toString();
73-
}
74-
75-
@Override
76-
public T fromString(CharSequence string) {
77-
throw new UnsupportedOperationException(
78-
"Conversion from String strategy not known for this Java type: " + getTypeName()
79-
);
80-
}
81-
8270
@Override
8371
public <X> X unwrap(T value, Class<X> type, WrapperOptions options) {
8472
if ( type.isAssignableFrom( getJavaTypeClass() ) ) {

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EntityJavaType.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.hibernate.type.descriptor.jdbc.JdbcType;
1212
import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
1313

14+
import static java.lang.System.identityHashCode;
1415
import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
1516

1617
/**
@@ -36,7 +37,7 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
3637

3738
@Override
3839
public int extractHashCode(T value) {
39-
return System.identityHashCode( value );
40+
return identityHashCode( value );
4041
}
4142

4243
@Override
@@ -57,18 +58,6 @@ public boolean isInstance(Object value) {
5758
}
5859
}
5960

60-
@Override
61-
public String toString(T value) {
62-
return value.toString();
63-
}
64-
65-
@Override
66-
public T fromString(CharSequence string) {
67-
throw new UnsupportedOperationException(
68-
"Conversion from String strategy not known for this Java type: " + getTypeName()
69-
);
70-
}
71-
7261
@Override @SuppressWarnings("unchecked") // safe, we do check
7362
public <X> X unwrap(T value, Class<X> type, WrapperOptions options) {
7463
final var id =

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBasicAdaptor.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,6 @@ public boolean useObjectEqualsHashCode() {
3737
return true;
3838
}
3939

40-
@Override
41-
public String toString(T value) {
42-
return value.toString();
43-
}
44-
45-
@Override
46-
public T fromString(CharSequence string) {
47-
throw new UnsupportedOperationException(
48-
"Conversion from String strategy not known for this Java type: " + getTypeName()
49-
);
50-
}
51-
5240
@Override
5341
public <X> X unwrap(T value, Class<X> type, WrapperOptions options) {
5442
throw new UnsupportedOperationException(

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/MapEntryJavaType.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
3131
throw new UnsupportedOperationException( "Unsupported attempt to resolve JDBC type for Map.Entry" );
3232
}
3333

34-
@Override
35-
public Map.Entry fromString(CharSequence string) {
36-
throw new UnsupportedOperationException( "Unsupported attempt create Map.Entry from String" );
37-
}
38-
3934
@Override
4035
public <X> X unwrap(Map.Entry value, Class<X> type, WrapperOptions options) {
4136
throw new UnsupportedOperationException( "Unsupported attempt to unwrap Map.Entry value" );

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/UnknownBasicJavaType.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,6 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
6161
);
6262
}
6363

64-
@Override
65-
public String toString(T value) {
66-
return value.toString();
67-
}
68-
69-
@Override
70-
public T fromString(CharSequence string) {
71-
throw new UnsupportedOperationException(
72-
"Conversion from String strategy not known for this Java type: " + getTypeName()
73-
);
74-
}
75-
7664
@Override
7765
public <X> X unwrap(T value, Class<X> type, WrapperOptions options) {
7866
if ( type.isAssignableFrom( getJavaTypeClass() ) ) {

0 commit comments

Comments
 (0)