more work on unchecked casts and type safety

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java

@@ -405,7 +405,7 @@ protected void contributeCockroachTypes(TypeContributions typeContributions, Ser
 						ObjectNullAsBinaryTypeJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java

@@ -1135,7 +1135,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						ObjectNullResolvingJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java

@@ -671,7 +671,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						ObjectNullResolvingJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 	}

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java

@@ -666,7 +666,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						ObjectNullResolvingJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 	}

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBDialect.java

@@ -1270,7 +1270,7 @@ protected void contributeGaussDBTypes(TypeContributions typeContributions) {
 						ObjectNullAsBinaryTypeJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java

@@ -1128,7 +1128,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						ObjectNullAsBinaryTypeJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 	}

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java

@@ -756,7 +756,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						NullJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 	}

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java

@@ -1029,15 +1029,15 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						NullJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 		typeContributions.contributeType(
 				new JavaObjectType(
 						ObjectNullAsNullTypeJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 						)
 		);
 	}

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java

@@ -1558,7 +1558,7 @@ protected void contributePostgreSQLTypes(TypeContributions typeContributions, Se
 						ObjectNullAsBinaryTypeJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java

@@ -665,7 +665,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 				NullJdbcType.INSTANCE,
 				typeContributions.getTypeConfiguration()
 						.getJavaTypeRegistry()
-						.getDescriptor( Object.class )
+						.resolveDescriptor( Object.class )
 		) );
 
 		jdbcTypeRegistry.addDescriptor( EnumJdbcType.INSTANCE );

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacyDialect.java

@@ -262,15 +262,15 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						ObjectNullAsBinaryTypeJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 		typeContributions.contributeType(
 				new NullType(
 						ObjectNullAsBinaryTypeJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 	}

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/internal/BasicValueBinder.java

@@ -831,7 +831,7 @@ private void prepareAnyDiscriminator(MemberDetails memberDetails) {
 			return originalResolution != null
 					? originalResolution
 					: typeConfiguration.getJavaTypeRegistry()
-							.getDescriptor( implicitJavaTypeAccess.apply( typeConfiguration ) )
+							.resolveDescriptor( implicitJavaTypeAccess.apply( typeConfiguration ) )
 							.getRecommendedJdbcType( typeConfiguration.getCurrentBaseSqlTypeIndicators() );
 		};
 	}

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

@@ -194,7 +194,7 @@ else if ( reflectedJtd instanceof SerializableJavaType
 		else {
 			if ( explicitJdbcType != null ) {
 				// we have an explicit STD, but no JTD - infer JTD
-				// NOTE : yes it's an odd case, but easy to implement here, so...
+				// NOTE: yes it's an odd case, but easy to implement here, so...
 				Integer length = null;
 				Integer scale = null;
 				if ( selectable instanceof Column column ) {
@@ -212,8 +212,10 @@ else if ( column.getLength() != null ) {
 					}
 				}
 
-				final JavaType<T> recommendedJtd =
-						explicitJdbcType.getJdbcRecommendedJavaTypeMapping( length, scale, typeConfiguration );
+				final var recommendedJavaType =
+						explicitJdbcType.getRecommendedJavaType( length, scale, typeConfiguration );
+				// TODO: check this type cast
+				final var recommendedJtd = (JavaType<T>) recommendedJavaType;
 				jdbcMapping = resolveSqlTypeIndicators(
 						stdIndicators,
 						basicTypeRegistry.resolve( recommendedJtd, explicitJdbcType ),

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 );