squash! try to improve type safety in JavaTypeRegistry and MutableMutabilityPlant

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterHelper.java

@@ -15,7 +15,6 @@
 import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.internal.util.GenericsHelper;
-import org.hibernate.internal.util.type.PrimitiveWrapperHelper;
 import org.hibernate.models.spi.MemberDetails;
 
 import com.fasterxml.classmate.ResolvedType;
@@ -24,6 +23,8 @@
 import com.fasterxml.classmate.members.ResolvedMethod;
 import jakarta.persistence.AttributeConverter;
 
+import static org.hibernate.internal.util.type.PrimitiveWrappers.canonicalize;
+
 /**
  * Helpers related to handling converters
  */
@@ -100,11 +101,8 @@ else if ( converterParamTypes.size() != 2 ) {
 	 * @return {@code true} if they match, otherwise {@code false}.
 	 */
 	public static boolean typesMatch(ResolvedType converterDefinedType, ResolvedType checkType) {
-		Class<?> erasedCheckType = checkType.getErasedType();
-		if ( erasedCheckType.isPrimitive() ) {
-			erasedCheckType = PrimitiveWrapperHelper.getDescriptorByPrimitiveType( erasedCheckType ).getWrapperClass();
-		}
-		else if ( erasedCheckType.isArray() ) {
+		final var erasedCheckType = canonicalize( checkType.getErasedType() );
+		if ( erasedCheckType.isArray() ) {
 			// converterDefinedType have type parameters if it extends super generic class
 			// but checkType doesn't have any type parameters
 			// comparing erased type is enough

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

@@ -28,29 +28,29 @@
  */
 public class VersionResolution<E> implements BasicValue.Resolution<E> {
 
-	// todo (6.0) : support explicit JTD?
-	// todo (6.0) : support explicit STD?
-
-	public static <E> VersionResolution<E> from(
+	public static VersionResolution<?> from(
 			Function<TypeConfiguration, java.lang.reflect.Type> implicitJavaTypeAccess,
 			TimeZoneStorageType timeZoneStorageType,
 			MetadataBuildingContext context) {
-
-		// todo (6.0) : add support for Dialect-specific interpretation?
-
 		final var typeConfiguration = context.getBootstrapContext().getTypeConfiguration();
 		final var implicitJavaType = implicitJavaTypeAccess.apply( typeConfiguration );
-		final JavaType<E> registered = typeConfiguration.getJavaTypeRegistry().getDescriptor( implicitJavaType );
-		final var basicJavaType = (BasicJavaType<E>) registered;
+		final var registered = typeConfiguration.getJavaTypeRegistry().resolveDescriptor( implicitJavaType );
+		return resolve( timeZoneStorageType, context, (BasicJavaType<?>) registered );
+	}
 
+	private static <E> VersionResolution<E> resolve(
+			TimeZoneStorageType timeZoneStorageType,
+			MetadataBuildingContext context,
+			BasicJavaType<E> basicJavaType) {
+		final var typeConfiguration = context.getBootstrapContext().getTypeConfiguration();
 		final var recommendedJdbcType = basicJavaType.getRecommendedJdbcType(
 				new JdbcTypeIndicators() {
 					@Override
 					public TypeConfiguration getTypeConfiguration() {
 						return typeConfiguration;
 					}
 
-					@Override
+					@Override @SuppressWarnings("deprecation")
 					public TemporalType getTemporalPrecision() {
 						// if it is a temporal version, it needs to be a TIMESTAMP
 						return TemporalType.TIMESTAMP;
@@ -106,7 +106,6 @@ public Dialect getDialect() {
 		final var basicTypeRegistry = typeConfiguration.getBasicTypeRegistry();
 		final var basicType = basicTypeRegistry.resolve( basicJavaType, recommendedJdbcType );
 		final var legacyType = basicTypeRegistry.getRegisteredType( basicJavaType.getJavaTypeClass() );
-
 		assert legacyType.getJdbcType().getDefaultSqlTypeCode() == recommendedJdbcType.getDefaultSqlTypeCode();
 
 		return new VersionResolution<>( basicJavaType, recommendedJdbcType, basicType, legacyType );