fix up some generic typing issues in the JavaTypes

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/EnumeratedValueConverter.java

@@ -36,7 +36,7 @@ public EnumeratedValueConverter(
 
 		ensureAccessibility( valueField );
 
-		final Class<E> enumJavaTypeClass = enumJavaType.getJavaTypeClass();
+		final var enumJavaTypeClass = enumJavaType.getJavaTypeClass();
 		final E[] enumConstants = enumJavaTypeClass.getEnumConstants();
 		relationalToEnumMap = mapOfSize( enumConstants.length );
 		enumToRelationalMap = mapOfSize( enumConstants.length );

hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java

@@ -404,8 +404,8 @@ private static <E extends Enum<E>> BasicType<E> createEnumeratedValueJdbcMapping
 		);
 	}
 
-	private static <E extends Enum<E>> Field determineEnumeratedValueField(Class<E> enumJavaTypeClass) {
-		for ( Field field : enumJavaTypeClass.getDeclaredFields() ) {
+	private static <E extends Enum<E>> Field determineEnumeratedValueField(Class<? extends E> enumJavaTypeClass) {
+		for ( var field : enumJavaTypeClass.getDeclaredFields() ) {
 			if ( field.isAnnotationPresent( EnumeratedValue.class ) ) {
 				return field;
 			}

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

@@ -34,7 +34,7 @@ public abstract class AbstractClassJavaType<T> implements BasicJavaType<T>, Seri
 	 *
 	 * @see #AbstractClassJavaType(Class, MutabilityPlan)
 	 */
-	protected AbstractClassJavaType(Class<? extends T> type) {
+	protected AbstractClassJavaType(Class<T> type) {
 		this( type, ImmutableMutabilityPlan.instance() );
 	}
 
@@ -44,12 +44,12 @@ protected AbstractClassJavaType(Class<? extends T> type) {
 	 * @param type The Java type.
 	 * @param mutabilityPlan The plan for handling mutability aspects of the java type.
 	 */
-	protected AbstractClassJavaType(Class<? extends T> type, MutabilityPlan<? extends T> mutabilityPlan) {
+	protected AbstractClassJavaType(Class<T> type, MutabilityPlan<T> mutabilityPlan) {
 		this(
 				type,
 				mutabilityPlan,
 				Comparable.class.isAssignableFrom( type )
-						? ComparableComparator.instance()
+						? ComparableComparator.INSTANCE
 						: null
 		);
 	}
@@ -61,14 +61,13 @@ protected AbstractClassJavaType(Class<? extends T> type, MutabilityPlan<? extend
 	 * @param mutabilityPlan The plan for handling mutability aspects of the java type.
 	 * @param comparator The comparator for handling comparison of values
 	 */
-	@SuppressWarnings("unchecked")
 	protected AbstractClassJavaType(
-			Class<? extends T> type,
-			MutabilityPlan<? extends T> mutabilityPlan,
-			Comparator<? extends T> comparator) {
-		this.type = (Class<T>) type;
-		this.mutabilityPlan = (MutabilityPlan<T>) mutabilityPlan;
-		this.comparator = (Comparator<T>) comparator;
+			Class<T> type,
+			MutabilityPlan<T> mutabilityPlan,
+			Comparator<T> comparator) {
+		this.type = type;
+		this.mutabilityPlan = mutabilityPlan;
+		this.comparator = comparator;
 	}
 
 	@Override

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

@@ -17,18 +17,18 @@ public abstract class AbstractTemporalJavaType<T>
 		extends AbstractClassJavaType<T>
 		implements TemporalJavaType<T> {
 
-	protected AbstractTemporalJavaType(Class<? extends T> type) {
+	protected AbstractTemporalJavaType(Class<T> type) {
 		super( type );
 	}
 
-	protected AbstractTemporalJavaType(Class<? extends T> type, MutabilityPlan<? extends T> mutabilityPlan) {
+	protected AbstractTemporalJavaType(Class<T> type, MutabilityPlan<T> mutabilityPlan) {
 		super( type, mutabilityPlan );
 	}
 
 	public AbstractTemporalJavaType(
-			Class<? extends T> type,
-			MutabilityPlan<? extends T> mutabilityPlan,
-			Comparator<? extends T> comparator) {
+			Class<T> type,
+			MutabilityPlan<T> mutabilityPlan,
+			Comparator<T> comparator) {
 		super( type, mutabilityPlan, comparator );
 	}
 

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

@@ -11,16 +11,16 @@
  *
  * @author Christian Beikov
  */
-public class ComponentArrayComparator implements Comparator<Object[]> {
+public class ComponentArrayComparator<E> implements Comparator<E[]> {
 
-	private final JavaType<Object>[] components;
+	private final JavaType<E>[] components;
 
-	public ComponentArrayComparator(JavaType<Object>[] components) {
+	public ComponentArrayComparator(JavaType<E>[] components) {
 		this.components = components;
 	}
 
 	@Override
-	public int compare(Object[] o1, Object[] o2) {
+	public int compare(E[] o1, E[] o2) {
 		for ( int i = 0; i < components.length; i++ ) {
 			final int cmp = components[i].getComparator().compare( o1[i], o2[i] );
 			if ( cmp != 0 ) {

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

@@ -52,14 +52,21 @@ public class JdbcDateJavaType extends AbstractTemporalJavaType<Date> {
 			.toFormatter();
 
 	public JdbcDateJavaType() {
-		super( java.sql.Date.class, DateMutabilityPlan.INSTANCE );
+		super( Date.class, DateMutabilityPlan.INSTANCE );
 	}
 
 	@Override
 	public TemporalType getPrecision() {
 		return TemporalType.DATE;
 	}
 
+	@Override
+	public Class<Date> getJavaType() {
+		// wrong, but needed for backward compatibility
+		//noinspection unchecked, rawtypes
+		return (Class) java.sql.Date.class;
+	}
+
 	@Override
 	public boolean isInstance(Object value) {
 		// this check holds true for java.sql.Date as well
@@ -135,9 +142,9 @@ public Object unwrap(Date value, Class type, WrapperOptions options) {
 		}
 
 		if ( Calendar.class.isAssignableFrom( type ) ) {
-			final GregorianCalendar cal = new GregorianCalendar();
-			cal.setTimeInMillis( unwrapDateEpoch( value ) );
-			return cal;
+			final var gregorianCalendar = new GregorianCalendar();
+			gregorianCalendar.setTimeInMillis( unwrapDateEpoch( value ) );
+			return gregorianCalendar;
 		}
 
 		if ( java.sql.Timestamp.class.isAssignableFrom( type ) ) {

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

@@ -52,14 +52,21 @@ public class JdbcTimeJavaType extends AbstractTemporalJavaType<Date> {
 
 
 	public JdbcTimeJavaType() {
-		super( Time.class, TimeMutabilityPlan.INSTANCE );
+		super( Date.class, TimeMutabilityPlan.INSTANCE );
 	}
 
 	@Override
 	public TemporalType getPrecision() {
 		return TemporalType.TIME;
 	}
 
+	@Override
+	public Class<Date> getJavaType() {
+		// wrong, but needed for backward compatibility
+		//noinspection unchecked, rawtypes
+		return (Class) java.sql.Time.class;
+	}
+
 	@Override
 	public boolean isInstance(Object value) {
 		// this check holds true for java.sql.Time as well
@@ -69,7 +76,7 @@ public boolean isInstance(Object value) {
 
 	@Override
 	public int extractHashCode(Date value) {
-		final Calendar calendar = Calendar.getInstance();
+		final var calendar = Calendar.getInstance();
 		calendar.setTime( value );
 		int hashCode = 1;
 		hashCode = 31 * hashCode + calendar.get( Calendar.HOUR_OF_DAY );
@@ -118,9 +125,9 @@ public Object unwrap(Date value, Class type, WrapperOptions options) {
 
 		if ( LocalTime.class.isAssignableFrom( type ) ) {
 			final Time time = value instanceof java.sql.Time
-					? ( (java.sql.Time) value )
+					? (java.sql.Time) value
 					: new java.sql.Time( value.getTime() % 86_400_000 );
-			final LocalTime localTime = time.toLocalTime();
+			final var localTime = time.toLocalTime();
 			long millis = time.getTime() % 1000;
 			if ( millis == 0 ) {
 				return localTime;
@@ -152,9 +159,9 @@ public Object unwrap(Date value, Class type, WrapperOptions options) {
 		}
 
 		if ( Calendar.class.isAssignableFrom( type ) ) {
-			final GregorianCalendar cal = new GregorianCalendar();
-			cal.setTimeInMillis( value.getTime() );
-			return cal;
+			final var gregorianCalendar = new GregorianCalendar();
+			gregorianCalendar.setTimeInMillis( value.getTime() );
+			return gregorianCalendar;
 		}
 
 		if ( java.sql.Timestamp.class.isAssignableFrom( type ) ) {

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

@@ -55,7 +55,14 @@ public class JdbcTimestampJavaType extends AbstractTemporalJavaType<Date> implem
 			.withZone( ZoneId.from( ZoneOffset.UTC ) );
 
 	public JdbcTimestampJavaType() {
-		super( Timestamp.class, TimestampMutabilityPlan.INSTANCE );
+		super( Date.class, TimestampMutabilityPlan.INSTANCE );
+	}
+
+	@Override
+	public Class<Date> getJavaType() {
+		// wrong, but needed for backward compatibility
+		//noinspection unchecked, rawtypes
+		return (Class) java.sql.Timestamp.class;
 	}
 
 	@Override
@@ -105,7 +112,7 @@ public boolean areEqual(Date one, Date another) {
 
 	@Override
 	public int extractHashCode(Date value) {
-		return Long.valueOf( value.getTime() / 1000 ).hashCode();
+		return Long.hashCode( value.getTime() / 1000 );
 	}
 
 	@Override
@@ -136,9 +143,9 @@ public Object unwrap(Date value, Class type, WrapperOptions options) {
 		}
 
 		if ( Calendar.class.isAssignableFrom( type ) ) {
-			final GregorianCalendar cal = new GregorianCalendar();
-			cal.setTimeInMillis( value.getTime() );
-			return cal;
+			final var gregorianCalendar = new GregorianCalendar();
+			gregorianCalendar.setTimeInMillis( value.getTime() );
+			return gregorianCalendar;
 		}
 
 		if ( Long.class.isAssignableFrom( type ) ) {
@@ -147,13 +154,13 @@ public Object unwrap(Date value, Class type, WrapperOptions options) {
 
 		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
 			return value instanceof java.sql.Date
-					? ( java.sql.Date ) value
+					? (java.sql.Date) value
 					: new java.sql.Date( value.getTime() );
 		}
 
 		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
 			return value instanceof java.sql.Time
-					? ( java.sql.Time ) value
+					? (java.sql.Time) value
 					: new java.sql.Time( value.getTime() % 86_400_000 );
 		}
 

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

@@ -42,13 +42,13 @@ public String toString(Object[] value) {
 		return sb.toString();
 	}
 
-	private void append(StringBuilder sb, JavaType[] components, Object[] value, int i) {
-		final Object o = value[i];
-		if (o == null ) {
-			sb.append( "null" );
+	private void append(StringBuilder builder, JavaType[] components, Object[] value, int i) {
+		final Object element = value[i];
+		if (element == null ) {
+			builder.append( "null" );
 		}
 		else {
-			sb.append( components[i].toString( o ) );
+			builder.append( components[i].toString( element ) );
 		}
 	}
 

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

@@ -36,7 +36,7 @@
 public class CollectionJavaType<C> extends AbstractClassJavaType<C> {
 	private final CollectionSemantics<C,?> semantics;
 
-	public CollectionJavaType(Class<? extends C> type, CollectionSemantics<C,?> semantics) {
+	public CollectionJavaType(Class<C> type, CollectionSemantics<C,?> semantics) {
 		super( type );
 		this.semantics = semantics;
 	}