clean up lost of calls to unsafe JavaTypeRegistry.getDescriptor() method

gavinking · gavinking · commit d9be649614fc · 2025-12-08T13:01:41.000+01:00
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java b/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 )
 				)
 		);
 
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java b/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 )
 				)
 		);
 
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java b/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 )
 				)
 		);
 	}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java b/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 )
 				)
 		);
 	}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBDialect.java b/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 )
 				)
 		);
 
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java b/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 )
 				)
 		);
 	}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java b/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 )
 				)
 		);
 	}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java b/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 )
 						)
 		);
 	}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java b/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 )
 				)
 		);
 
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java b/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 );
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacyDialect.java b/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 )
 				)
 		);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java b/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() );
 		};
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java
@@ -37,12 +37,12 @@ public static BasicType<?> resolveArrayType(DomainType<?> elementType, TypeConfi
 
 	@SuppressWarnings("unchecked")
 	public static BasicType<?> resolveListType(DomainType<?> elementType, TypeConfiguration typeConfiguration) {
-		final BasicPluralJavaType<Object> arrayJavaType =
+		final var arrayJavaType =
 				(BasicPluralJavaType<Object>)
 						typeConfiguration.getJavaTypeRegistry()
-								.getDescriptor( List.class )
+								.resolveDescriptor( List.class )
 								.createJavaType(
-										new ParameterizedTypeImpl( List.class, new Type[]{ elementType.getJavaType() }, null ),
+										new ParameterizedTypeImpl( List.class, new Type[] { elementType.getJavaType() }, null ),
 										typeConfiguration
 								);
 		return arrayJavaType.resolveType(
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
@@ -779,7 +779,7 @@ private JavaType<?> specialJavaType(
 					return xmlJavaType;
 			}
 		}
-		return javaTypeRegistry.getDescriptor( impliedJavaType );
+		return javaTypeRegistry.resolveDescriptor( impliedJavaType );
 	}
 
 	private MutabilityPlan<?> mutabilityPlan(
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableRepresentationStrategyPojo.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableRepresentationStrategyPojo.java
@@ -120,13 +120,13 @@ public EmbeddableRepresentationStrategyPojo(
 		}
 	}
 
-	private static <T> JavaType<T> resolveEmbeddableJavaType(
+	private static <T> JavaType<?> resolveEmbeddableJavaType(
 			Component bootDescriptor,
 			CompositeUserType<T> compositeUserType,
 			RuntimeModelCreationContext creationContext) {
 		final var javaTypeRegistry = creationContext.getTypeConfiguration().getJavaTypeRegistry();
 		return compositeUserType == null
-				? javaTypeRegistry.getDescriptor( bootDescriptor.getComponentClass() )
+				? javaTypeRegistry.resolveDescriptor( bootDescriptor.getComponentClass() )
 				: javaTypeRegistry.resolveDescriptor( compositeUserType.returnedClass(),
 						() -> new CompositeUserTypeJavaTypeWrapper<>( compositeUserType ) );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/InstantiationHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/InstantiationHelper.java
@@ -83,7 +83,7 @@ public static boolean isConstructorCompatible(
 				final var type =
 						parameterType instanceof Class<?> classParameter
 								? classParameter
-								: typeConfiguration.getJavaTypeRegistry().getDescriptor( parameterType )
+								: typeConfiguration.getJavaTypeRegistry().resolveDescriptor( parameterType )
 										.getJavaTypeClass();
 				if ( !areAssignmentCompatible( type, argumentType ) ) {
 					if ( LOG.isDebugEnabled() ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ListResultsConsumer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ListResultsConsumer.java
@@ -290,18 +290,19 @@ private JavaType<R> resolveDomainResultJavaType(
 		final JavaTypeRegistry javaTypeRegistry = typeConfiguration.getJavaTypeRegistry();
 
 		if ( domainResultResultJavaType != null ) {
-			final JavaType<R> resultJavaType = javaTypeRegistry.resolveDescriptor( domainResultResultJavaType );
+			final var resultJavaType = javaTypeRegistry.resolveDescriptor( domainResultResultJavaType );
 			// Could be that the user requested a more general type than the actual type,
 			// so resolve the most concrete type since this type is used to determine equality of objects
-			if ( resultJavaTypes.size() == 1 && isMoreConcrete( resultJavaType, resultJavaTypes.get( 0 ) ) ) {
+			if ( resultJavaTypes.size() == 1
+					&& isMoreConcrete( resultJavaType, resultJavaTypes.get( 0 ) ) ) {
 				//noinspection unchecked
 				return (JavaType<R>) resultJavaTypes.get( 0 );
 			}
 			return resultJavaType;
 		}
 
 		if ( resultJavaTypes.size() == 1 ) {
-			final JavaType<?> firstJavaType = resultJavaTypes.get( 0 );
+			final var firstJavaType = resultJavaTypes.get( 0 );
 			if ( firstJavaType == null ) {
 				return javaTypeRegistry.getDescriptor( Object.class );
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java
@@ -137,9 +137,9 @@ public <J> BasicType<J> resolve(Class<J> javaType, int sqlTypeCode) {
 		return resolve( getJavaTypeRegistry().resolveDescriptor( javaType ), sqlTypeCode );
 	}
 
-	@Deprecated(since = "7.2", forRemoval = true) // no longer used + calls deprecated method
+	// no longer used
 	public BasicType<?> resolve(java.lang.reflect.Type javaType, int sqlTypeCode) {
-		return resolve( getJavaTypeRegistry().getDescriptor( javaType ), sqlTypeCode );
+		return resolve( getJavaTypeRegistry().resolveDescriptor( javaType ), sqlTypeCode );
 	}
 
 	public <J> BasicType<J> resolve(JavaType<J> javaType, int sqlTypeCode) {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/ConverterHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/ConverterHelper.java
@@ -21,28 +21,34 @@
 public class ConverterHelper {
 	public static <X, Y> BasicValueConverter<X, Y> createValueConverter(
 			AttributeConverter<X,Y> converter, JavaTypeRegistry registry) {
-		final var converterType = extractParameterizedType( converter.getClass(), AttributeConverter.class );
-		final var typeArguments = converterType.getActualTypeArguments();
-		final var domainJavaClass = extractClass( typeArguments[0] );
-		final var relationalJavaClass = extractClass( typeArguments[1] );
+		final var typeArguments =
+				extractParameterizedType( converter.getClass(), AttributeConverter.class )
+						.getActualTypeArguments();
+		@SuppressWarnings("unchecked") // perfectly safe
+		final var domainJavaClass = (Class<X>) extractClass( typeArguments[0] );
+		@SuppressWarnings("unchecked") // perfectly safe
+		final var relationalJavaClass = (Class<Y>) extractClass( typeArguments[1] );
 		return new AttributeConverterInstance<>(
 				converter,
-				registry.getDescriptor( domainJavaClass ),
-				registry.getDescriptor( relationalJavaClass )
+				registry.resolveDescriptor( domainJavaClass ),
+				registry.resolveDescriptor( relationalJavaClass )
 		);
 	}
 
 	public static <X, Y> JpaAttributeConverter<X, Y> createJpaAttributeConverter(
 			ManagedBean<? extends AttributeConverter<X,Y>> bean, JavaTypeRegistry registry) {
-		final var converterType = extractParameterizedType( bean.getBeanClass(), AttributeConverter.class );
-		final var typeArguments = converterType.getActualTypeArguments();
-		final var domainJavaClass = extractClass( typeArguments[0] );
-		final var relationalJavaClass = extractClass( typeArguments[1] );
+		final var typeArguments =
+				extractParameterizedType( bean.getBeanClass(), AttributeConverter.class )
+						.getActualTypeArguments();
+		@SuppressWarnings("unchecked") // perfectly safe
+		final var domainJavaClass = (Class<X>) extractClass( typeArguments[0] );
+		@SuppressWarnings("unchecked") // perfectly safe
+		final var relationalJavaClass = (Class<Y>) extractClass( typeArguments[1] );
 		return new AttributeConverterBean<>(
 				bean,
 				registry.resolveDescriptor( bean.getBeanClass() ),
-				registry.getDescriptor( domainJavaClass ),
-				registry.getDescriptor( relationalJavaClass )
+				registry.resolveDescriptor( domainJavaClass ),
+				registry.resolveDescriptor( relationalJavaClass )
 		);
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/CollectionJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/CollectionJavaType.java
@@ -65,7 +65,7 @@ public JavaType<C> createJavaType(
 			case BAG, ID_BAG, LIST, SET, SORTED_SET, ORDERED_SET ->
 					new BasicCollectionJavaType(
 							parameterizedType,
-							registry.getDescriptor( typeArguments[typeArguments.length-1] ),
+							registry.resolveDescriptor( typeArguments[typeArguments.length-1] ),
 							semantics
 					);
 			case MAP, ORDERED_MAP, SORTED_MAP ->
@@ -74,8 +74,8 @@ public JavaType<C> createJavaType(
 							parameterizedType,
 							new MapMutabilityPlan(
 									(MapSemantics) semantics,
-									registry.getDescriptor( typeArguments[0] ),
-									registry.getDescriptor( typeArguments[typeArguments.length-1] )
+									registry.resolveDescriptor( typeArguments[0] ),
+									registry.resolveDescriptor( typeArguments[typeArguments.length-1] )
 							)
 					);
 		};
diff --git a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
@@ -847,7 +847,7 @@ public <J> BasicType<J> standardBasicTypeForJavaType(
 			final var registeredType =
 					basicTypeRegistry.getRegisteredType( javaClass );
 			return registeredType == null
-					? creator.apply( javaTypeRegistry.getDescriptor( javaClass ) )
+					? creator.apply( javaTypeRegistry.resolveDescriptor( javaClass ) )
 					: registeredType;
 		}
 	}
@@ -870,7 +870,7 @@ public <J> BasicType<?> standardBasicTypeForJavaType(
 			//noinspection unchecked
 			return registeredType == null
 					? creator.apply( (JavaType<J>) // UNCHECKED CAST
-							javaTypeRegistry.getDescriptor( javaType ) )
+							javaTypeRegistry.resolveDescriptor( javaType ) )
 					: registeredType;
 		}
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayAggregateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayAggregateTest.java
@@ -80,7 +80,7 @@ public void contribute(
 						jdbcTypeRegistry.getDescriptor( SqlTypes.VARCHAR ),
 						"StringArray"
 				).addAuxiliaryDatabaseObjects(
-						new ArrayJavaType<>( javaTypeRegistry.getDescriptor( String.class ) ),
+						new ArrayJavaType<>( javaTypeRegistry.resolveDescriptor( String.class ) ),
 						null,
 						Size.nil(),
 						metadata.getDatabase(),
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/CustomTypeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/CustomTypeConverterTest.java
@@ -51,7 +51,7 @@ protected void performAssertions(
 			);
 
 			assertThat(
-					bootTypeConfiguration.getJavaTypeRegistry().getDescriptor( PayloadWrapper.class ),
+					bootTypeConfiguration.getJavaTypeRegistry().resolveDescriptor( PayloadWrapper.class ),
 					sameInstance( PayloadWrapperJavaType.INSTANCE )
 			);
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumType.java
@@ -116,7 +116,9 @@ else if ( reader != null ) {
 			enumClass = (Class<T>) reader.getReturnedClass().asSubclass( Enum.class );
 		}
 
-		final JavaType<T> descriptor = typeConfiguration.getJavaTypeRegistry().getDescriptor( enumClass );
+		final JavaType<T> descriptor =
+				typeConfiguration.getJavaTypeRegistry()
+						.resolveDescriptor( enumClass );
 		enumJavaType = (EnumJavaType<T>) descriptor;
 
 		if ( parameters.containsKey( TYPE ) ) {
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverterTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverterTest.java
@@ -48,7 +48,7 @@ public void testConverterUsage() {
 
 				final TypeConfiguration typeConfiguration = sessionFactory.getMappingMetamodel().getTypeConfiguration();
 
-				assertThat( typeConfiguration.getJavaTypeRegistry().getDescriptor( Geometry.class ) )
+				assertThat( typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Geometry.class ) )
 						.isSameAs( GeolatteGeometryJavaType.GEOMETRY_INSTANCE );
 
 				// todo (5.3) : what to assert wrt to SqlTypeDescriptor?  Anything?
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/CockroachTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/CockroachTypeContributor.java
@@ -47,15 +47,15 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							floatBasicType,
 							genericVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR.getName()
 			);
 			basicTypeRegistry.register(
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.FLOAT ),
 							floatVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR_FLOAT32.getName()
 			);
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/DB2VectorTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/DB2VectorTypeContributor.java
@@ -48,23 +48,23 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							floatBasicType,
 							genericVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR.getName()
 			);
 			basicTypeRegistry.register(
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.FLOAT ),
 							floatVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR_FLOAT32.getName()
 			);
 			basicTypeRegistry.register(
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.BYTE ),
 							byteVectorJdbcType,
-							javaTypeRegistry.getDescriptor( byte[].class )
+							javaTypeRegistry.resolveDescriptor( byte[].class )
 					),
 					StandardBasicTypes.VECTOR_INT8.getName()
 			);
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/HANAVectorTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/HANAVectorTypeContributor.java
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/MariaDBTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/MariaDBTypeContributor.java
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/MySQLTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/MySQLTypeContributor.java
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/OracleVectorTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/OracleVectorTypeContributor.java
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGVectorTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGVectorTypeContributor.java
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/SQLServerTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/SQLServerTypeContributor.java
diff --git a/hibernate-vector/src/test/java/org/hibernate/vector/VectorTestHelper.java b/hibernate-vector/src/test/java/org/hibernate/vector/VectorTestHelper.java

Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ protected void contributeCockroachTypes(TypeContributions typeContributions, Ser`
`405`	`405`	`ObjectNullAsBinaryTypeJdbcType.INSTANCE,`
`406`	`406`	`typeContributions.getTypeConfiguration()`
`407`	`407`	`.getJavaTypeRegistry()`
`408`		`- .getDescriptor( Object.class )`
	`408`	`+ .resolveDescriptor( Object.class )`
`409`	`409`	`)`
`410`	`410`	`);`
`411`	`411`
Original file line number	Diff line number	Diff line change
`@@ -1135,7 +1135,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry`
`1135`	`1135`	`ObjectNullResolvingJdbcType.INSTANCE,`
`1136`	`1136`	`typeContributions.getTypeConfiguration()`
`1137`	`1137`	`.getJavaTypeRegistry()`
`1138`		`- .getDescriptor( Object.class )`
	`1138`	`+ .resolveDescriptor( Object.class )`
`1139`	`1139`	`)`
`1140`	`1140`	`);`
`1141`	`1141`
Original file line number	Diff line number	Diff line change
`@@ -671,7 +671,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry`
`671`	`671`	`ObjectNullResolvingJdbcType.INSTANCE,`
`672`	`672`	`typeContributions.getTypeConfiguration()`
`673`	`673`	`.getJavaTypeRegistry()`
`674`		`- .getDescriptor( Object.class )`
	`674`	`+ .resolveDescriptor( Object.class )`
`675`	`675`	`)`
`676`	`676`	`);`
`677`	`677`	`}`
Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry`
`666`	`666`	`ObjectNullResolvingJdbcType.INSTANCE,`
`667`	`667`	`typeContributions.getTypeConfiguration()`
`668`	`668`	`.getJavaTypeRegistry()`
`669`		`- .getDescriptor( Object.class )`
	`669`	`+ .resolveDescriptor( Object.class )`
`670`	`670`	`)`
`671`	`671`	`);`
`672`	`672`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1270,7 +1270,7 @@ protected void contributeGaussDBTypes(TypeContributions typeContributions) {`
`1270`	`1270`	`ObjectNullAsBinaryTypeJdbcType.INSTANCE,`
`1271`	`1271`	`typeContributions.getTypeConfiguration()`
`1272`	`1272`	`.getJavaTypeRegistry()`
`1273`		`- .getDescriptor( Object.class )`
	`1273`	`+ .resolveDescriptor( Object.class )`
`1274`	`1274`	`)`
`1275`	`1275`	`);`
`1276`	`1276`
Original file line number	Diff line number	Diff line change
`@@ -1128,7 +1128,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry`
`1128`	`1128`	`ObjectNullAsBinaryTypeJdbcType.INSTANCE,`
`1129`	`1129`	`typeContributions.getTypeConfiguration()`
`1130`	`1130`	`.getJavaTypeRegistry()`
`1131`		`- .getDescriptor( Object.class )`
	`1131`	`+ .resolveDescriptor( Object.class )`
`1132`	`1132`	`)`
`1133`	`1133`	`);`
`1134`	`1134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -756,7 +756,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry`
`756`	`756`	`NullJdbcType.INSTANCE,`
`757`	`757`	`typeContributions.getTypeConfiguration()`
`758`	`758`	`.getJavaTypeRegistry()`
`759`		`- .getDescriptor( Object.class )`
	`759`	`+ .resolveDescriptor( Object.class )`
`760`	`760`	`)`
`761`	`761`	`);`
`762`	`762`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1029,15 +1029,15 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry`
`1029`	`1029`	`NullJdbcType.INSTANCE,`
`1030`	`1030`	`typeContributions.getTypeConfiguration()`
`1031`	`1031`	`.getJavaTypeRegistry()`
`1032`		`- .getDescriptor( Object.class )`
	`1032`	`+ .resolveDescriptor( Object.class )`
`1033`	`1033`	`)`
`1034`	`1034`	`);`
`1035`	`1035`	`typeContributions.contributeType(`
`1036`	`1036`	`new JavaObjectType(`
`1037`	`1037`	`ObjectNullAsNullTypeJdbcType.INSTANCE,`
`1038`	`1038`	`typeContributions.getTypeConfiguration()`
`1039`	`1039`	`.getJavaTypeRegistry()`
`1040`		`- .getDescriptor( Object.class )`
	`1040`	`+ .resolveDescriptor( Object.class )`
`1041`	`1041`	`)`
`1042`	`1042`	`);`
`1043`	`1043`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1558,7 +1558,7 @@ protected void contributePostgreSQLTypes(TypeContributions typeContributions, Se`
`1558`	`1558`	`ObjectNullAsBinaryTypeJdbcType.INSTANCE,`
`1559`	`1559`	`typeContributions.getTypeConfiguration()`
`1560`	`1560`	`.getJavaTypeRegistry()`
`1561`		`- .getDescriptor( Object.class )`
	`1561`	`+ .resolveDescriptor( Object.class )`
`1562`	`1562`	`)`
`1563`	`1563`	`);`
`1564`	`1564`