small fix

Author: gavinking

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

@@ -12,6 +12,7 @@
 import java.util.function.Supplier;
 
 import org.hibernate.MappingException;
+import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.mapping.BasicValue;
@@ -60,7 +61,8 @@ public static <T> BasicValue.Resolution<T> from(
 			String propertyName,
 			MetadataBuildingContext buildingContext) {
 		final Dialect dialect = buildingContext.getMetadataCollector().getDatabase().getDialect();
-		final TypeConfiguration typeConfiguration = buildingContext.getBootstrapContext().getTypeConfiguration();
+		final BootstrapContext bootstrapContext = buildingContext.getBootstrapContext();
+		final TypeConfiguration typeConfiguration = bootstrapContext.getTypeConfiguration();
 
 		final JavaType<T> reflectedJtd = reflectedJtdResolver.get();
 
@@ -70,16 +72,15 @@ public static <T> BasicValue.Resolution<T> from(
 
 		final BasicType<T> jdbcMapping;
 
-		if ( explicitJavaType != null ) {
+		if (explicitJavaType != null) {
 			// we have an explicit JavaType
 			if ( isTemporal( explicitJavaType ) ) {
 				return fromTemporal(
 						(TemporalJavaType<T>) explicitJavaType,
 						null,
 						explicitJdbcType,
 						explicitMutabilityPlanAccess,
-						stdIndicators,
-						typeConfiguration
+						stdIndicators
 				);
 			}
 			else if ( explicitJdbcType != null ) {
@@ -116,7 +117,8 @@ else if ( reflectedJtd != null ) {
 				return fromEnum(
 						(EnumJavaType) reflectedJtd,
 						null,
-						stdIndicators
+						stdIndicators,
+						bootstrapContext
 				);
 			}
 			else if ( isTemporal( reflectedJtd ) ) {
@@ -125,8 +127,7 @@ else if ( isTemporal( reflectedJtd ) ) {
 						null,
 						explicitJdbcType,
 						explicitMutabilityPlanAccess,
-						stdIndicators,
-						typeConfiguration
+						stdIndicators
 				);
 			}
 			else if ( explicitJdbcType != null ) {
@@ -148,8 +149,8 @@ else if ( explicitJdbcType != null ) {
 						final BasicValue.Resolution<?> resolution = fromEnum(
 								(EnumJavaType<?>) elementJtd,
 								null,
-								stdIndicators
-						);
+								stdIndicators,
+								bootstrapContext);
 						registeredElementType = (BasicType<?>) resolution.getJdbcMapping();
 					}
 					else if ( isTemporal( elementJtd ) ) {
@@ -158,8 +159,7 @@ else if ( isTemporal( elementJtd ) ) {
 								null,
 								null,
 								explicitMutabilityPlanAccess,
-								stdIndicators,
-								typeConfiguration
+								stdIndicators
 						);
 						registeredElementType = resolution.getLegacyResolvedBasicType();
 					}
@@ -305,17 +305,19 @@ public static <T> BasicType<T> resolveSqlTypeIndicators(
 	public static <E extends Enum<E>> BasicValue.Resolution<E> fromEnum(
 			EnumJavaType<E> enumJavaType,
 			JdbcType explicitJdbcType,
-			JdbcTypeIndicators stdIndicators) {
+			JdbcTypeIndicators stdIndicators,
+			BootstrapContext bootstrapContext) {
 		final JdbcType jdbcType = explicitJdbcType == null
-				? enumJavaType.getRecommendedJdbcType( stdIndicators )
+				? enumJavaType.getRecommendedJdbcType(stdIndicators)
 				: explicitJdbcType;
-		final BasicType<E> jdbcMapping = new BasicTypeImpl<>( enumJavaType, jdbcType );
+		final BasicTypeImpl<E> basicType = new BasicTypeImpl<>(enumJavaType, jdbcType);
+		bootstrapContext.registerAdHocBasicType(basicType);
 		return new InferredBasicValueResolution<>(
-				jdbcMapping,
+				basicType,
 				enumJavaType,
 				enumJavaType,
 				jdbcType,
-				jdbcMapping,
+				basicType,
 				ImmutableMutabilityPlan.instance()
 		);
 	}
@@ -325,15 +327,15 @@ public static <T> BasicValue.Resolution<T> fromTemporal(
 			BasicJavaType<?> explicitJavaType,
 			JdbcType explicitJdbcType,
 			Function<TypeConfiguration, MutabilityPlan> explicitMutabilityPlanAccess,
-			JdbcTypeIndicators stdIndicators,
-			TypeConfiguration typeConfiguration) {
+			JdbcTypeIndicators stdIndicators) {
+		final TypeConfiguration typeConfiguration = stdIndicators.getTypeConfiguration();
 		final TemporalType requestedTemporalPrecision = stdIndicators.getTemporalPrecision();
 
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		// Case #1 - explicit JavaType
 
-		if ( explicitJavaType != null ) {
-			if ( !isTemporal( explicitJavaType ) ) {
+		if (explicitJavaType != null) {
+			if (!isTemporal(explicitJavaType)) {
 				throw new MappingException(
 						"Explicit JavaType [" + explicitJavaType +
 								"] defined for temporal value must implement TemporalJavaType"
@@ -342,7 +344,6 @@ public static <T> BasicValue.Resolution<T> fromTemporal(
 
 			@SuppressWarnings("unchecked")
 			final TemporalJavaType<T> explicitTemporalJtd = (TemporalJavaType<T>) explicitJavaType;
-
 			if ( requestedTemporalPrecision != null && explicitTemporalJtd.getPrecision() != requestedTemporalPrecision ) {
 				throw new MappingException(
 						"Temporal precision (`jakarta.persistence.TemporalType`) mismatch... requested precision = " + requestedTemporalPrecision +
@@ -354,9 +355,7 @@ public static <T> BasicValue.Resolution<T> fromTemporal(
 			final JdbcType jdbcType = explicitJdbcType != null
 					? explicitJdbcType
 					: explicitTemporalJtd.getRecommendedJdbcType( stdIndicators );
-
 			final BasicType<T> jdbcMapping = typeConfiguration.getBasicTypeRegistry().resolve( explicitTemporalJtd, jdbcType );
-
 			final MutabilityPlan<T> mutabilityPlan = determineMutabilityPlan( explicitMutabilityPlanAccess, explicitTemporalJtd, typeConfiguration );
 			return new InferredBasicValueResolution<>(
 					jdbcMapping,