From 1814ec52a5ccec9835dea14367aa9a044c0e0c75 Mon Sep 17 00:00:00 2001 From: Gavin King Date: Fri, 5 Dec 2025 21:15:22 +0100 Subject: [PATCH] eliminate some unnecessary overrides in JavaTypes --- .../type/descriptor/java/BasicJavaType.java | 3 ++- .../descriptor/java/CalendarDateJavaType.java | 2 +- .../type/descriptor/java/CalendarJavaType.java | 2 +- .../descriptor/java/CalendarTimeJavaType.java | 2 +- .../java/spi/EmbeddableAggregateJavaType.java | 12 ------------ .../type/descriptor/java/spi/EntityJavaType.java | 15 ++------------- .../descriptor/java/spi/JavaTypeBasicAdaptor.java | 12 ------------ .../descriptor/java/spi/MapEntryJavaType.java | 5 ----- .../descriptor/java/spi/UnknownBasicJavaType.java | 12 ------------ 9 files changed, 7 insertions(+), 58 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java index 77eb3f485218..58032644ecda 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java @@ -34,6 +34,7 @@ default JdbcType getRecommendedJdbcType(JdbcTypeIndicators indicators) { @Override default T fromString(CharSequence string) { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException( "Type " + getTypeName() + + " does not support conversion from String"); } } diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java index db5446e701ca..26d916fed2c0 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java @@ -60,7 +60,7 @@ public String toString(Calendar value) { } public Calendar fromString(CharSequence string) { - Calendar result = new GregorianCalendar(); + final var result = new GregorianCalendar(); result.setTime( JdbcDateJavaType.INSTANCE.fromString( string.toString() ) ); return result; } diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java index 3b23b21b162f..517566d06959 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java @@ -69,7 +69,7 @@ public String toString(Calendar value) { } public Calendar fromString(CharSequence string) { - Calendar result = new GregorianCalendar(); + final var result = new GregorianCalendar(); result.setTime( DateJavaType.INSTANCE.fromString( string.toString() ) ); return result; } diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeJavaType.java index 077c1fdb50c9..bd6a6e91fc30 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeJavaType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeJavaType.java @@ -60,7 +60,7 @@ public String toString(Calendar value) { } public Calendar fromString(CharSequence string) { - Calendar result = new GregorianCalendar(); + final var result = new GregorianCalendar(); result.setTime( JdbcTimeJavaType.INSTANCE.fromString( string.toString() ) ); return result; } diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java index b5d5613c9fcb..4e9d0d189978 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java @@ -67,18 +67,6 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) { ); } - @Override - public String toString(T value) { - return value.toString(); - } - - @Override - public T fromString(CharSequence string) { - throw new UnsupportedOperationException( - "Conversion from String strategy not known for this Java type: " + getTypeName() - ); - } - @Override public X unwrap(T value, Class type, WrapperOptions options) { if ( type.isAssignableFrom( getJavaTypeClass() ) ) { diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EntityJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EntityJavaType.java index a4304068fafe..fa57add4632d 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EntityJavaType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EntityJavaType.java @@ -11,6 +11,7 @@ import org.hibernate.type.descriptor.jdbc.JdbcType; import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators; +import static java.lang.System.identityHashCode; import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer; /** @@ -36,7 +37,7 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) { @Override public int extractHashCode(T value) { - return System.identityHashCode( value ); + return identityHashCode( value ); } @Override @@ -57,18 +58,6 @@ public boolean isInstance(Object value) { } } - @Override - public String toString(T value) { - return value.toString(); - } - - @Override - public T fromString(CharSequence string) { - throw new UnsupportedOperationException( - "Conversion from String strategy not known for this Java type: " + getTypeName() - ); - } - @Override @SuppressWarnings("unchecked") // safe, we do check public X unwrap(T value, Class type, WrapperOptions options) { final var id = diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBasicAdaptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBasicAdaptor.java index 44e1bf3fa45f..fe24516b513e 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBasicAdaptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBasicAdaptor.java @@ -37,18 +37,6 @@ public boolean useObjectEqualsHashCode() { return true; } - @Override - public String toString(T value) { - return value.toString(); - } - - @Override - public T fromString(CharSequence string) { - throw new UnsupportedOperationException( - "Conversion from String strategy not known for this Java type: " + getTypeName() - ); - } - @Override public X unwrap(T value, Class type, WrapperOptions options) { throw new UnsupportedOperationException( diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/MapEntryJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/MapEntryJavaType.java index 833cb7cb65b9..0690edf93de8 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/MapEntryJavaType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/MapEntryJavaType.java @@ -31,11 +31,6 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) { throw new UnsupportedOperationException( "Unsupported attempt to resolve JDBC type for Map.Entry" ); } - @Override - public Map.Entry fromString(CharSequence string) { - throw new UnsupportedOperationException( "Unsupported attempt create Map.Entry from String" ); - } - @Override public X unwrap(Map.Entry value, Class type, WrapperOptions options) { throw new UnsupportedOperationException( "Unsupported attempt to unwrap Map.Entry value" ); diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/UnknownBasicJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/UnknownBasicJavaType.java index 96ec9049b3b7..cd8350352248 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/UnknownBasicJavaType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/UnknownBasicJavaType.java @@ -61,18 +61,6 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) { ); } - @Override - public String toString(T value) { - return value.toString(); - } - - @Override - public T fromString(CharSequence string) { - throw new UnsupportedOperationException( - "Conversion from String strategy not known for this Java type: " + getTypeName() - ); - } - @Override public X unwrap(T value, Class type, WrapperOptions options) { if ( type.isAssignableFrom( getJavaTypeClass() ) ) {