use Class.cast() to remove all the horrible unchecked type casts in the JavaTypes

Author: gavinking

hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java

@@ -55,18 +55,18 @@ public abstract class AbstractStandardBasicType<T>
 
 	public AbstractStandardBasicType(JdbcType jdbcType, JavaType<T> javaType) {
 		this.jdbcType = jdbcType;
-		this.sqlTypes = new int[] { jdbcType.getDdlTypeCode() };
 		this.javaType = javaType;
+		sqlTypes = new int[] { jdbcType.getDdlTypeCode() };
 
-		this.jdbcValueBinder = jdbcType.getBinder( javaType );
-		this.jdbcValueExtractor = jdbcType.getExtractor( javaType );
-		this.jdbcLiteralFormatter = jdbcType.getJdbcLiteralFormatter( javaType );
+		jdbcValueBinder = jdbcType.getBinder( javaType );
+		jdbcValueExtractor = jdbcType.getExtractor( javaType );
+		jdbcLiteralFormatter = jdbcType.getJdbcLiteralFormatter( javaType );
 
 		//A very simple dispatch optimisation, make these a constant:
-		this.javaTypeClass = javaType.getJavaTypeClass();
-		this.mutabilityPlan = javaType.getMutabilityPlan();
-		this.javatypeComparator = javaType.getComparator();
-		this.typeForEqualsHashCode = javaType.useObjectEqualsHashCode() ? null : this;
+		javaTypeClass = javaType.getJavaTypeClass();
+		mutabilityPlan = javaType.getMutabilityPlan();
+		javatypeComparator = javaType.getComparator();
+		typeForEqualsHashCode = javaType.useObjectEqualsHashCode() ? null : this;
 	}
 
 	@Override
@@ -174,7 +174,6 @@ public final boolean isEqual(Object x, Object y, SessionFactoryImplementor facto
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public boolean isEqual(Object one, Object another) {
 		if ( one == another ) {
 			return true;
@@ -186,19 +185,15 @@ else if ( typeForEqualsHashCode == null ) {
 			return one.equals( another );
 		}
 		else {
-			return javaType.areEqual( (T) one, (T) another );
+			return javaType.areEqual( javaType.cast( one ), javaType.cast(  another ) );
 		}
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
-	public int getHashCode(Object x) {
-		if ( typeForEqualsHashCode == null ) {
-			return x.hashCode();
-		}
-		else {
-			return javaType.extractHashCode( (T) x );
-		}
+	public int getHashCode(Object object) {
+		return typeForEqualsHashCode == null
+				? object.hashCode()
+				: javaType.extractHashCode( javaType.cast( object ) );
 	}
 
 	@Override
@@ -212,9 +207,8 @@ public final int getHashCode(Object x, SessionFactoryImplementor factory) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public final int compare(Object x, Object y) {
-		return this.javatypeComparator.compare( (T) x, (T) y );
+		return this.javatypeComparator.compare( javaType.cast( x ) , javaType.cast( y )  );
 	}
 
 	@Override
@@ -228,9 +222,11 @@ public final boolean isDirty(Object old, Object current, boolean[] checkable, Sh
 	}
 
 	protected final boolean isDirty(Object old, Object current) {
-		// MutableMutabilityPlan.INSTANCE is a special plan for which we always have to assume the value is dirty,
-		// because we can't actually copy a value, but have no knowledge about the mutability of the java type
-		return getMutabilityPlan() == MutableMutabilityPlan.INSTANCE || !isSame( old, current );
+		// MutableMutabilityPlan.INSTANCE is a special plan for which we always
+		// have to assume the value is dirty, because we can't actually copy a
+		// value, but have no knowledge about the mutability of the java type
+		return getMutabilityPlan() == MutableMutabilityPlan.INSTANCE
+			|| !isSame( old, current );
 	}
 
 	@Override
@@ -247,22 +243,23 @@ public final void nullSafeSet(
 			PreparedStatement st,
 			Object value,
 			int index,
-			final SharedSessionContractImplementor session) throws SQLException {
-		//noinspection unchecked
-		nullSafeSet( st, (T) value, index, (WrapperOptions) session );
+			final SharedSessionContractImplementor session)
+				throws SQLException {
+		nullSafeSet( st, javaType.cast( value ) , index, (WrapperOptions) session );
 	}
 
-	protected void nullSafeSet(PreparedStatement st, T value, int index, WrapperOptions options) throws SQLException {
+	protected void nullSafeSet(PreparedStatement st, T value, int index, WrapperOptions options)
+			throws SQLException {
 		getJdbcValueBinder().bind( st, value, index, options );
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public final String toLoggableString(Object value, SessionFactoryImplementor factory) {
-		if ( value == LazyPropertyInitializer.UNFETCHED_PROPERTY || !Hibernate.isInitialized( value ) ) {
-			return  "<uninitialized>";
-		}
-		return javaType.extractLoggableRepresentation( (T) value );
+		return value == LazyPropertyInitializer.UNFETCHED_PROPERTY
+			|| !Hibernate.isInitialized( value )
+				? "<uninitialized>"
+				: javaType.extractLoggableRepresentation(
+						javaType.coerce( value, factory::getTypeConfiguration ) );
 	}
 
 	@Override
@@ -271,19 +268,17 @@ public final boolean isMutable() {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public final Object deepCopy(Object value, SessionFactoryImplementor factory) {
-		return deepCopy( (T) value );
+		return deepCopy( javaType.cast( value )  );
 	}
 
 	protected final T deepCopy(T value) {
 		return getMutabilityPlan().deepCopy( value );
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public final Serializable disassemble(Object value, SharedSessionContractImplementor session, Object owner) throws HibernateException {
-		return getMutabilityPlan().disassemble( (T) value, session );
+		return getMutabilityPlan().disassemble( javaType.cast( value ) , session );
 	}
 
 	@Override
@@ -296,16 +291,14 @@ public final void beforeAssemble(Serializable cached, SharedSessionContractImple
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public final Object replace(Object original, Object target, SharedSessionContractImplementor session, Object owner, Map<Object, Object> copyCache) {
 		return original == null && target == null
 				? null
-				: javaType.getReplacement( (T) original, (T) target, session );
+				: javaType.getReplacement( javaType.cast( original ) , javaType.cast( target ) , session );
 
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public Object replace(
 			Object original,
 			Object target,
@@ -314,6 +307,9 @@ public Object replace(
 			Map<Object, Object> copyCache,
 			ForeignKeyDirection foreignKeyDirection) {
 		return ForeignKeyDirection.FROM_PARENT == foreignKeyDirection
+				// TODO: use cast() .. currently failing on embeddable discriminators where
+				//       the concrete class is passed in instead of its disciminator value
+//				? javaType.getReplacement( javaType.cast( original ) , javaType.cast( target ) , session )
 				? javaType.getReplacement( (T) original, (T) target, session )
 				: target;
 	}
@@ -325,20 +321,12 @@ public boolean canDoExtraction() {
 
 	@Override
 	public T extract(CallableStatement statement, int startIndex, final SharedSessionContractImplementor session) throws SQLException {
-		return getJdbcValueExtractor().extract(
-				statement,
-				startIndex,
-				session
-		);
+		return getJdbcValueExtractor().extract( statement, startIndex, session );
 	}
 
 	@Override
 	public T extract(CallableStatement statement, String paramName, final SharedSessionContractImplementor session) throws SQLException {
-		return getJdbcValueExtractor().extract(
-				statement,
-				paramName,
-				session
-		);
+		return getJdbcValueExtractor().extract( statement, paramName, session );
 	}
 
 	@Override
@@ -347,7 +335,8 @@ public void nullSafeSet(
 			Object value,
 			int index,
 			boolean[] settable,
-			SharedSessionContractImplementor session) throws SQLException {
+			SharedSessionContractImplementor session)
+				throws SQLException {
 
 	}
 
@@ -356,9 +345,8 @@ public void nullSafeSet(CallableStatement st, T value, String name, SharedSessio
 		nullSafeSet( st, value, name, (WrapperOptions) session );
 	}
 
-	@SuppressWarnings("unchecked")
 	protected final void nullSafeSet(CallableStatement st, Object value, String name, WrapperOptions options) throws SQLException {
-		getJdbcValueBinder().bind( st, (T) value, name, options );
+		getJdbcValueBinder().bind( st, javaType.cast( value ) , name, options );
 	}
 
 	@Override
@@ -379,7 +367,7 @@ public CastType getCastType() {
 		// Due to that, we have to handle some conversions in wrap/unwrap of BooleanJavaType
 		// and the cast type determination here. Note that we interpret the converter in ConvertedBasicTypeImpl
 		// to properly determine the correct cast type
-		final JdbcType jdbcType = getJdbcType();
+		final var jdbcType = getJdbcType();
 		final int jdbcTypeCode = jdbcType.getDdlTypeCode();
 		switch ( jdbcTypeCode ) {
 			case Types.BIT:

hibernate-core/src/main/java/org/hibernate/type/EntityType.java

@@ -461,7 +461,7 @@ private Object getUniqueKey(Object value, SharedSessionContractImplementor sessi
 		if ( lazyInitializer != null ) {
 			// If the value is a Proxy and the property access is field, the value returned by
 			// attributeMapping.getAttributeMetadata().getPropertyAccess().getGetter().get( object )
-			// is always null except for the id, we need the to use the proxy implementation to
+			// is always null except for the id, and we need to use the proxy implementation to
 			// extract the property value.
 			value = lazyInitializer.getImplementation();
 		}
@@ -530,7 +530,7 @@ private String loggableString(Object entity, EntityPersister persister) {
 			return associatedEntityName + "#" + entity;
 		}
 		else {
-			final StringBuilder result = new StringBuilder().append( associatedEntityName );
+			final var result = new StringBuilder().append( associatedEntityName );
 			if ( persister.hasIdentifierProperty() ) {
 				result.append( '#' ).append( identifierString( entity, persister ) );
 			}

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

@@ -81,7 +81,7 @@ public Class<T> getJavaType() {
 	}
 
 	@Override
-	public Class<T> getJavaTypeClass() {
+	public final Class<T> getJavaTypeClass() {
 		return getJavaType();
 	}
 

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

@@ -256,24 +256,21 @@ public <X> X unwrap(T[] value, Class<X> type, WrapperOptions options) {
 		}
 
 		if ( type.isInstance( value ) ) {
-			//noinspection unchecked
-			return (X) value;
+			return type.cast( value );
 		}
 		else if ( type == byte[].class ) {
-			return (X) toBytes( value );
+			return type.cast( toBytes( value ) );
 		}
 		else if ( type == BinaryStream.class ) {
-			//noinspection unchecked
-			return (X) new ArrayBackedBinaryStream( toBytes( value ) );
+			return type.cast( new ArrayBackedBinaryStream( toBytes( value ) ) );
 		}
 		else if ( type.isArray() ) {
 		final var preferredJavaTypeClass = type.getComponentType();
-			final Object[] unwrapped = (Object[]) newInstance( preferredJavaTypeClass, value.length );
+			final var unwrapped = (Object[]) newInstance( preferredJavaTypeClass, value.length );
 			for ( int i = 0; i < value.length; i++ ) {
 				unwrapped[i] = getElementJavaType().unwrap( value[i], preferredJavaTypeClass, options );
 			}
-			//noinspection unchecked
-			return (X) unwrapped;
+			return type.cast( unwrapped );
 		}
 
 		throw unknownUnwrap( type );

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

@@ -37,6 +37,11 @@ public boolean isInstance(Object value) {
 		return value instanceof BigDecimal;
 	}
 
+	@Override
+	public BigDecimal cast(Object value) {
+		return (BigDecimal) value;
+	}
+
 	@Override
 	public boolean areEqual(BigDecimal one, BigDecimal another) {
 		return one == another
@@ -48,37 +53,36 @@ public int extractHashCode(BigDecimal value) {
 		return value.intValue();
 	}
 
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(BigDecimal value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( BigDecimal.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( BigInteger.class.isAssignableFrom( type ) ) {
-			return (X) value.toBigIntegerExact();
+			return type.cast( value.toBigIntegerExact() );
 		}
 		if ( Byte.class.isAssignableFrom( type ) ) {
-			return (X) Byte.valueOf( value.byteValue() );
+			return type.cast( value.byteValue() );
 		}
 		if ( Short.class.isAssignableFrom( type ) ) {
-			return (X) Short.valueOf( value.shortValue() );
+			return type.cast( value.shortValue() );
 		}
 		if ( Integer.class.isAssignableFrom( type ) ) {
-			return (X) Integer.valueOf( value.intValue() );
+			return type.cast( value.intValue() );
 		}
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( value.longValue() );
+			return type.cast( value.longValue() );
 		}
 		if ( Double.class.isAssignableFrom( type ) ) {
-			return (X) Double.valueOf( value.doubleValue() );
+			return type.cast( value.doubleValue() );
 		}
 		if ( Float.class.isAssignableFrom( type ) ) {
-			return (X) Float.valueOf( value.floatValue() );
+			return type.cast( value.floatValue() );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) value.toString();
+			return type.cast( value.toString() );
 		}
 		throw unknownUnwrap( type );
 	}

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

@@ -39,43 +39,47 @@ public boolean isInstance(Object value) {
 		return value instanceof BigInteger;
 	}
 
+	@Override
+	public BigInteger cast(Object value) {
+		return (BigInteger) value;
+	}
+
 	@Override
 	public int extractHashCode(BigInteger value) {
 		return value.intValue();
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(BigInteger value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( BigInteger.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( BigDecimal.class.isAssignableFrom( type ) ) {
-			return (X) new BigDecimal( value );
+			return type.cast( new BigDecimal( value ) );
 		}
 		if ( Byte.class.isAssignableFrom( type ) ) {
-			return (X) Byte.valueOf( value.byteValue() );
+			return type.cast( Byte.valueOf( value.byteValue() ) );
 		}
 		if ( Short.class.isAssignableFrom( type ) ) {
-			return (X) Short.valueOf( value.shortValue() );
+			return type.cast( value.shortValue() );
 		}
 		if ( Integer.class.isAssignableFrom( type ) ) {
-			return (X) Integer.valueOf( value.intValue() );
+			return type.cast( value.intValue() );
 		}
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( value.longValue() );
+			return type.cast( value.longValue() );
 		}
 		if ( Double.class.isAssignableFrom( type ) ) {
-			return (X) Double.valueOf( value.doubleValue() );
+			return type.cast( value.doubleValue() );
 		}
 		if ( Float.class.isAssignableFrom( type ) ) {
-			return (X) Float.valueOf( value.floatValue() );
+			return type.cast( value.floatValue() );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) value.toString();
+			return type.cast( value.toString() );
 		}
 		throw unknownUnwrap( type );
 	}