HHH-16935 Fix inconsistent method name

quaff · beikov · commit 356471787639 · 2024-01-05T16:41:40.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
@@ -975,7 +975,7 @@ public boolean isXmlMappingEnabled() {
 		}
 
 		@Override
-		public boolean disallowExtensionsInCdi() {
+		public boolean isAllowExtensionsInCdi() {
 			return allowExtensionsInCdi;
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java
@@ -302,7 +302,7 @@ private static Object instantiateType(
 			String name,
 			Class<?> typeImplementorClass,
 			BeanInstanceProducer instanceProducer) {
-		if ( buildingOptions.disallowExtensionsInCdi() ) {
+		if ( !buildingOptions.isAllowExtensionsInCdi() ) {
 			return name != null
 					? instanceProducer.produceBeanInstance( name, typeImplementorClass )
 					: instanceProducer.produceBeanInstance( typeImplementorClass );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java
@@ -494,15 +494,9 @@ private static void handleJdbcTypeRegistration(
 			ManagedBeanRegistry managedBeanRegistry,
 			JdbcTypeRegistration annotation) {
 		final Class<? extends JdbcType> jdbcTypeClass = annotation.value();
-
-		final JdbcType jdbcType;
-		if ( context.getBuildingOptions().disallowExtensionsInCdi() ) {
-			jdbcType = FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( jdbcTypeClass );
-		}
-		else {
-			jdbcType = managedBeanRegistry.getBean( jdbcTypeClass ).getBeanInstance();
-		}
-
+		final JdbcType jdbcType = !context.getBuildingOptions().isAllowExtensionsInCdi()
+				? FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( jdbcTypeClass )
+				: managedBeanRegistry.getBean( jdbcTypeClass ).getBeanInstance();
 		final int typeCode = annotation.registrationCode() == Integer.MIN_VALUE
 				? jdbcType.getDefaultSqlTypeCode()
 				: annotation.registrationCode();
@@ -514,14 +508,10 @@ private static void handleJavaTypeRegistration(
 			ManagedBeanRegistry managedBeanRegistry,
 			JavaTypeRegistration annotation) {
 		final Class<? extends BasicJavaType<?>> javaTypeClass = annotation.descriptorClass();
-
-		final BasicJavaType<?> javaType;
-		if ( context.getBuildingOptions().disallowExtensionsInCdi() ) {
-			javaType = FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( javaTypeClass );
-		}
-		else {
-			javaType = managedBeanRegistry.getBean( javaTypeClass ).getBeanInstance();
-		}
+		final BasicJavaType<?> javaType =
+				!context.getBuildingOptions().isAllowExtensionsInCdi()
+						? FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( javaTypeClass )
+						: managedBeanRegistry.getBean( javaTypeClass ).getBeanInstance();
 		context.getMetadataCollector().addJavaTypeRegistration( annotation.javaType(), javaType );
 	}
 
@@ -751,16 +741,11 @@ public Dialect getDialect() {
 	}
 
 	private static JdbcMapping resolveUserType(Class<UserType<?>> userTypeClass, MetadataBuildingContext context) {
-		final UserType<?> userType;
-		if ( context.getBuildingOptions().disallowExtensionsInCdi() ) {
-			userType = FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( userTypeClass );
-		}
-		else {
-			final StandardServiceRegistry serviceRegistry = context.getBootstrapContext().getServiceRegistry();
-			final ManagedBeanRegistry beanRegistry = serviceRegistry.getService( ManagedBeanRegistry.class );
-			userType = beanRegistry.getBean( userTypeClass ).getBeanInstance();
-		}
-
+		final UserType<?> userType = !context.getBuildingOptions().isAllowExtensionsInCdi()
+				? FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( userTypeClass )
+				: context.getBootstrapContext().getServiceRegistry()
+						.requireService( ManagedBeanRegistry.class )
+						.getBean( userTypeClass ).getBeanInstance();
 		return new CustomType<>( userType, context.getBootstrapContext().getTypeConfiguration() );
 	}
 
@@ -812,7 +797,7 @@ private static JavaType<?> getJavaType(
 			return registeredJtd;
 		}
 
-		if ( context.getBuildingOptions().disallowExtensionsInCdi() ) {
+		if ( !context.getBuildingOptions().isAllowExtensionsInCdi() ) {
 			return FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( javaTypeClass );
 		}
 
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
@@ -432,7 +432,7 @@ private void prepareCollectionId(XProperty modelXProperty) {
 			throw new MappingException( "idbag mapping missing @CollectionId" );
 		}
 
-		final boolean useDeferredBeanContainerAccess = buildingContext.getBuildingOptions().disallowExtensionsInCdi();
+		final boolean useDeferredBeanContainerAccess = !buildingContext.getBuildingOptions().isAllowExtensionsInCdi();
 		final ManagedBeanRegistry beanRegistry = getManagedBeanRegistry();
 
 		explicitBasicTypeName = null;
@@ -555,7 +555,7 @@ private void prepareMapKey(
 			temporalPrecision = mapKeyTemporalAnn.value();
 		}
 
-		final boolean useDeferredBeanContainerAccess = buildingContext.getBuildingOptions().disallowExtensionsInCdi();
+		final boolean useDeferredBeanContainerAccess = !buildingContext.getBuildingOptions().isAllowExtensionsInCdi();
 
 		explicitJdbcTypeAccess = typeConfiguration -> {
 			final MapKeyJdbcType jdbcTypeAnn = findAnnotation( mapAttribute, MapKeyJdbcType.class );
@@ -658,7 +658,7 @@ private void prepareMapKey(
 	private void prepareListIndex(XProperty listAttribute) {
 		implicitJavaTypeAccess = typeConfiguration -> Integer.class;
 
-		final boolean useDeferredBeanContainerAccess = buildingContext.getBuildingOptions().disallowExtensionsInCdi();
+		final boolean useDeferredBeanContainerAccess = !buildingContext.getBuildingOptions().isAllowExtensionsInCdi();
 		final ManagedBeanRegistry beanRegistry = buildingContext
 				.getBootstrapContext()
 				.getServiceRegistry()
@@ -873,7 +873,7 @@ private void prepareAnyDiscriminator(XProperty modelXProperty) {
 	private void prepareAnyKey(XProperty modelXProperty) {
 		implicitJavaTypeAccess = (typeConfiguration) -> null;
 
-		final boolean useDeferredBeanContainerAccess = buildingContext.getBuildingOptions().disallowExtensionsInCdi();
+		final boolean useDeferredBeanContainerAccess = !buildingContext.getBuildingOptions().isAllowExtensionsInCdi();
 
 		explicitJavaTypeAccess = (typeConfiguration) -> {
 			final AnyKeyJavaType javaTypeAnn = findAnnotation( modelXProperty, AnyKeyJavaType.class );
@@ -930,7 +930,7 @@ private void normalJdbcTypeDetails(XProperty attributeXProperty) {
 			if ( jdbcTypeAnn != null ) {
 				final Class<? extends JdbcType> jdbcTypeClass = normalizeJdbcType( jdbcTypeAnn.value() );
 				if ( jdbcTypeClass != null ) {
-					if ( buildingContext.getBuildingOptions().disallowExtensionsInCdi() ) {
+					if ( !buildingContext.getBuildingOptions().isAllowExtensionsInCdi() ) {
 						return FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( jdbcTypeClass );
 					}
 					return getManagedBeanRegistry().getBean( jdbcTypeClass ).getBeanInstance();
@@ -1043,7 +1043,7 @@ private <T> MutabilityPlan<T> resolveMutability(Class<? extends MutabilityPlan>
 			return ImmutableMutabilityPlan.instance();
 		}
 
-		if ( buildingContext.getBuildingOptions().disallowExtensionsInCdi() ) {
+		if ( !buildingContext.getBuildingOptions().isAllowExtensionsInCdi() ) {
 			return FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( mutability );
 		}
 
@@ -1057,7 +1057,7 @@ private void normalSupplementalDetails(XProperty attributeXProperty) {
 			if ( javaTypeAnn != null ) {
 				final Class<? extends BasicJavaType<?>> javaTypeClass = normalizeJavaType( javaTypeAnn.value() );
 				if ( javaTypeClass != null ) {
-					if ( buildingContext.getBuildingOptions().disallowExtensionsInCdi() ) {
+					if ( !buildingContext.getBuildingOptions().isAllowExtensionsInCdi() ) {
 						return FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( javaTypeClass );
 					}
 					final ManagedBean<? extends BasicJavaType<?>> jtdBean = getManagedBeanRegistry().getBean( javaTypeClass );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java
@@ -846,7 +846,7 @@ private static ManagedBean<? extends UserCollectionType> createCustomType(
 			Map<String,String> parameters,
 			MetadataBuildingContext buildingContext) {
 		final boolean hasParameters = CollectionHelper.isNotEmpty( parameters );
-		if ( buildingContext.getBuildingOptions().disallowExtensionsInCdi() ) {
+		if ( !buildingContext.getBuildingOptions().isAllowExtensionsInCdi() ) {
 			// if deferred container access is enabled, we locally create the user-type
 			return MappingHelper.createLocalUserCollectionTypeBean( role, implementation, hasParameters, parameters );
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java
@@ -405,7 +405,7 @@ static Component fillEmbeddable(
 	private static CompositeUserType<?> compositeUserType(
 			Class<? extends CompositeUserType<?>> compositeUserTypeClass,
 			MetadataBuildingContext context) {
-		if ( context.getBuildingOptions().disallowExtensionsInCdi() ) {
+		if ( !context.getBuildingOptions().isAllowExtensionsInCdi() ) {
 			FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( compositeUserTypeClass );
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
@@ -2632,7 +2632,7 @@ else if ( isVirtual ) {
 					if ( CompositeUserType.class.isAssignableFrom( componentClass ) ) {
 						componentBinding.setTypeName( explicitComponentClassName );
 						CompositeUserType<?> compositeUserType;
-						if ( sourceDocument.getBuildingOptions().disallowExtensionsInCdi() ) {
+						if ( !sourceDocument.getBuildingOptions().isAllowExtensionsInCdi() ) {
 							compositeUserType = (CompositeUserType<?>) FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( componentClass );
 						}
 						else {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java
@@ -178,7 +178,7 @@ public boolean isXmlMappingEnabled() {
 	}
 
 	@Override
-	public boolean disallowExtensionsInCdi() {
-		return delegate.disallowExtensionsInCdi();
+	public boolean isAllowExtensionsInCdi() {
+		return delegate.isAllowExtensionsInCdi();
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java
@@ -243,5 +243,15 @@ default boolean isXmlMappingEnabled() {
 	/**
 	 * Check to see if extensions can be hosted in CDI
 	 */
-	boolean disallowExtensionsInCdi();
+	boolean isAllowExtensionsInCdi();
+
+	/**
+	 * Check to see if extensions can be hosted in CDI
+	 *
+	 * @deprecated Use {@link #isAllowExtensionsInCdi()}
+	 */
+	@Deprecated(forRemoval = true)
+	default boolean disallowExtensionsInCdi() {
+		return !isAllowExtensionsInCdi();
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
@@ -841,7 +841,7 @@ public <T extends UserType<?>> void setExplicitCustomType(Class<T> explicitCusto
 			}
 
 			final T typeInstance;
-			if ( getBuildingContext().getBuildingOptions().disallowExtensionsInCdi() ) {
+			if ( !getBuildingContext().getBuildingOptions().isAllowExtensionsInCdi() ) {
 				typeInstance = FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( explicitCustomType );
 			}
 			else {
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java b/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java
@@ -60,7 +60,7 @@ public static CollectionType customCollection(
 		final boolean hasParameters = CollectionHelper.isNotEmpty( typeParameters );
 		final ManagedBean<? extends UserCollectionType> userTypeBean;
 
-		if ( metadata.getMetadataBuildingOptions().disallowExtensionsInCdi() ) {
+		if ( !metadata.getMetadataBuildingOptions().isAllowExtensionsInCdi() ) {
 			//noinspection unchecked,rawtypes
 			userTypeBean = createLocalUserCollectionTypeBean(
 					role,
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/ManagedTypeRepresentationResolverStandard.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/ManagedTypeRepresentationResolverStandard.java
@@ -82,7 +82,7 @@ public EmbeddableRepresentationStrategy resolveStrategy(
 			final Class<CompositeUserType<?>> userTypeClass = creationContext.getBootstrapContext()
 					.getClassLoaderAccess()
 					.classForName( bootDescriptor.getTypeName() );
-			if ( creationContext.getBootModel().getMetadataBuildingOptions().disallowExtensionsInCdi() ) {
+			if ( !creationContext.getBootModel().getMetadataBuildingOptions().isAllowExtensionsInCdi() ) {
 				compositeUserType = FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( userTypeClass );
 			}
 			else {
@@ -99,7 +99,7 @@ public EmbeddableRepresentationStrategy resolveStrategy(
 		final EmbeddableInstantiator customInstantiator;
 		if ( bootDescriptor.getCustomInstantiator() != null ) {
 			final Class<? extends EmbeddableInstantiator> instantiatorClass = bootDescriptor.getCustomInstantiator();
-			if ( creationContext.getBootModel().getMetadataBuildingOptions().disallowExtensionsInCdi() ) {
+			if ( !creationContext.getBootModel().getMetadataBuildingOptions().isAllowExtensionsInCdi() ) {
 				customInstantiator = FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( instantiatorClass );
 			}
 			else {
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
@@ -494,7 +494,7 @@ else if ( sessionFactory != null ) {
 		private void setMetadataBuildingContext(MetadataBuildingContext metadataBuildingContext) {
 			this.metadataBuildingContext = metadataBuildingContext;
 			if ( metadataBuildingContext != null ) {
-				this.allowExtensionsInCdi = metadataBuildingContext.getBuildingOptions().disallowExtensionsInCdi();
+				this.allowExtensionsInCdi = metadataBuildingContext.getBuildingOptions().isAllowExtensionsInCdi();
 			}
 		}
 
@@ -811,7 +811,7 @@ public static boolean isDuration(SqmExpressible<?> type) {
 
 	@Internal @SuppressWarnings("unchecked")
 	public <J> MutabilityPlan<J> createMutabilityPlan(Class<? extends MutabilityPlan<?>> planClass) {
-		if ( scope.allowExtensionsInCdi ) {
+		if ( !scope.allowExtensionsInCdi ) {
 			//noinspection rawtypes
 			return (MutabilityPlan) FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( planClass );
 		}
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ComponentMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ComponentMetadataGenerator.java
@@ -53,7 +53,7 @@ public void addComponent(
 		final Component propComponent = (Component) value;
 		final EmbeddableInstantiator instantiator;
 		if ( propComponent.getCustomInstantiator() != null ) {
-			if ( getMetadataBuildingContext().getBuildingOptions().disallowExtensionsInCdi() ) {
+			if ( !getMetadataBuildingContext().getBuildingOptions().isAllowExtensionsInCdi() ) {
 				instantiator = FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( propComponent.getCustomInstantiator() );
 			}
 			else {
@@ -68,7 +68,7 @@ else if ( propComponent.getTypeName() != null ) {
 			final Class<CompositeUserType<?>> userTypeClass = getMetadataBuildingContext().getBootstrapContext()
 					.getClassLoaderAccess()
 					.classForName( propComponent.getTypeName() );
-			if ( getMetadataBuildingContext().getBuildingOptions().disallowExtensionsInCdi() ) {
+			if ( !getMetadataBuildingContext().getBuildingOptions().isAllowExtensionsInCdi() ) {
 				final CompositeUserType<?> compositeUserType = FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( userTypeClass );
 				//noinspection rawtypes
 				instantiator = new EmbeddableCompositeUserTypeInstantiator( (CompositeUserType) compositeUserType );

Original file line number	Diff line number	Diff line change
`@@ -975,7 +975,7 @@ public boolean isXmlMappingEnabled() {`
`975`	`975`	`}`
`976`	`976`
`977`	`977`	`@Override`
`978`		`- public boolean disallowExtensionsInCdi() {`
	`978`	`+ public boolean isAllowExtensionsInCdi() {`
`979`	`979`	`return allowExtensionsInCdi;`
`980`	`980`	`}`
`981`	`981`
Original file line number	Diff line number	Diff line change
`@@ -846,7 +846,7 @@ private static ManagedBean<? extends UserCollectionType> createCustomType(`
`846`	`846`	`Map<String,String> parameters,`
`847`	`847`	`MetadataBuildingContext buildingContext) {`
`848`	`848`	`final boolean hasParameters = CollectionHelper.isNotEmpty( parameters );`
`849`		`- if ( buildingContext.getBuildingOptions().disallowExtensionsInCdi() ) {`
	`849`	`+ if ( !buildingContext.getBuildingOptions().isAllowExtensionsInCdi() ) {`
`850`	`850`	`// if deferred container access is enabled, we locally create the user-type`
`851`	`851`	`return MappingHelper.createLocalUserCollectionTypeBean( role, implementation, hasParameters, parameters );`
`852`	`852`	`}`
Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ static Component fillEmbeddable(`
`405`	`405`	`private static CompositeUserType<?> compositeUserType(`
`406`	`406`	`Class<? extends CompositeUserType<?>> compositeUserTypeClass,`
`407`	`407`	`MetadataBuildingContext context) {`
`408`		`- if ( context.getBuildingOptions().disallowExtensionsInCdi() ) {`
	`408`	`+ if ( !context.getBuildingOptions().isAllowExtensionsInCdi() ) {`
`409`	`409`	`FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( compositeUserTypeClass );`
`410`	`410`	`}`
`411`	`411`
Original file line number	Diff line number	Diff line change
`@@ -2632,7 +2632,7 @@ else if ( isVirtual ) {`
`2632`	`2632`	`if ( CompositeUserType.class.isAssignableFrom( componentClass ) ) {`
`2633`	`2633`	`componentBinding.setTypeName( explicitComponentClassName );`
`2634`	`2634`	`CompositeUserType<?> compositeUserType;`
`2635`		`- if ( sourceDocument.getBuildingOptions().disallowExtensionsInCdi() ) {`
	`2635`	`+ if ( !sourceDocument.getBuildingOptions().isAllowExtensionsInCdi() ) {`
`2636`	`2636`	`compositeUserType = (CompositeUserType<?>) FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( componentClass );`
`2637`	`2637`	`}`
`2638`	`2638`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ public boolean isXmlMappingEnabled() {`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`@Override`
`181`		`- public boolean disallowExtensionsInCdi() {`
`182`		`- return delegate.disallowExtensionsInCdi();`
	`181`	`+ public boolean isAllowExtensionsInCdi() {`
	`182`	`+ return delegate.isAllowExtensionsInCdi();`
`183`	`183`	`}`
`184`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -841,7 +841,7 @@ public <T extends UserType<?>> void setExplicitCustomType(Class<T> explicitCusto`
`841`	`841`	`}`
`842`	`842`
`843`	`843`	`final T typeInstance;`
`844`		`- if ( getBuildingContext().getBuildingOptions().disallowExtensionsInCdi() ) {`
	`844`	`+ if ( !getBuildingContext().getBuildingOptions().isAllowExtensionsInCdi() ) {`
`845`	`845`	`typeInstance = FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( explicitCustomType );`
`846`	`846`	`}`
`847`	`847`	`else {`