Skip to content

lots of cleanup to Query hierarchy and deprecate a ConfigurationService operation #10877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 5, 2025
Merged

lots of cleanup to Query hierarchy and deprecate a ConfigurationService operation #10877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
239f9ff
clean up some config logic
gavinking Sep 5, 2025
af847f9
optimize some imports
gavinking Sep 5, 2025
7cc7245
lots of cleanups in the Query hierarchy
gavinking Sep 5, 2025
2aaeb32
cleanups in SqmUtil
gavinking Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 41 additions & 33 deletions hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@

import org.hibernate.AnnotationException;
import org.hibernate.HibernateException;
import org.hibernate.cfg.CacheSettings;
import org.hibernate.cfg.JpaComplianceSettings;
import org.hibernate.cfg.ManagedBeanSettings;
import org.hibernate.cfg.SchemaToolingSettings;
import org.hibernate.context.spi.MultiTenancy;
import org.hibernate.type.TimeZoneStorageStrategy;
import org.hibernate.annotations.CacheConcurrencyStrategy;
Expand Down Expand Up @@ -61,7 +65,6 @@
import org.hibernate.boot.spi.MetadataSourcesContributor;
import org.hibernate.cache.spi.RegionFactory;
import org.hibernate.cache.spi.access.AccessType;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.MappingSettings;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.TimeZoneSupport;
Expand All @@ -87,10 +90,8 @@
import jakarta.persistence.ConstraintMode;
import jakarta.persistence.SharedCacheMode;

import static org.hibernate.cfg.AvailableSettings.JPA_COMPLIANCE;
import static org.hibernate.cfg.AvailableSettings.WRAPPER_ARRAY_HANDLING;
import static org.hibernate.cfg.MappingSettings.XML_FORMAT_MAPPER_LEGACY_FORMAT;
import static org.hibernate.engine.config.spi.StandardConverters.BOOLEAN;
import static org.hibernate.engine.config.spi.StandardConverters.STRING;
import static org.hibernate.internal.util.NullnessHelper.coalesceSuppliedValues;
import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
import static org.hibernate.internal.util.collections.CollectionHelper.isNotEmpty;
Expand Down Expand Up @@ -447,7 +448,7 @@ public MetadataImplementor build() {
sources.getHbmXmlBindings(),
bootModel,
UnsupportedFeatureHandling.fromSetting(
configurationService.getSettings().get( AvailableSettings.TRANSFORM_HBM_XML_FEATURE_HANDLING ),
configurationService.getSettings().get( MappingSettings.TRANSFORM_HBM_XML_FEATURE_HANDLING ),
UnsupportedFeatureHandling.ERROR
)
);
Expand Down Expand Up @@ -505,26 +506,26 @@ public MappingDefaultsImpl(StandardServiceRegistry serviceRegistry) {
implicitCatalogName = null;

implicitlyQuoteIdentifiers = configService.getSetting(
AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS,
MappingSettings.GLOBALLY_QUOTED_IDENTIFIERS,
BOOLEAN,
false
);

implicitCacheAccessType = configService.getSetting(
AvailableSettings.DEFAULT_CACHE_CONCURRENCY_STRATEGY,
CacheSettings.DEFAULT_CACHE_CONCURRENCY_STRATEGY,
value -> AccessType.fromExternalName( value.toString() )
);

implicitListClassification = configService.getSetting(
AvailableSettings.DEFAULT_LIST_SEMANTICS,
MappingSettings.DEFAULT_LIST_SEMANTICS,
value -> {
final CollectionClassification classification = CollectionClassification.interpretSetting( value );
if ( classification != CollectionClassification.LIST && classification != CollectionClassification.BAG ) {
throw new AnnotationException(
String.format(
Locale.ROOT,
"'%s' should specify either '%s' or '%s' (was '%s')",
AvailableSettings.DEFAULT_LIST_SEMANTICS,
MappingSettings.DEFAULT_LIST_SEMANTICS,
java.util.List.class.getName(),
java.util.Collection.class.getName(),
classification.name()
Expand Down Expand Up @@ -654,45 +655,49 @@ public MetadataBuildingOptionsImpl(StandardServiceRegistry serviceRegistry) {
multiTenancyEnabled = MultiTenancy.isMultiTenancyEnabled( serviceRegistry );

xmlMappingEnabled = configService.getSetting(
AvailableSettings.XML_MAPPING_ENABLED,
MappingSettings.XML_MAPPING_ENABLED,
BOOLEAN,
true
);
xmlFormatMapperLegacyFormat = configService.getSetting( XML_FORMAT_MAPPER_LEGACY_FORMAT, BOOLEAN, false );
xmlFormatMapperLegacyFormat = configService.getSetting(
MappingSettings.XML_FORMAT_MAPPER_LEGACY_FORMAT,
BOOLEAN,
false
);

implicitDiscriminatorsForJoinedInheritanceSupported = configService.getSetting(
AvailableSettings.IMPLICIT_DISCRIMINATOR_COLUMNS_FOR_JOINED_SUBCLASS,
MappingSettings.IMPLICIT_DISCRIMINATOR_COLUMNS_FOR_JOINED_SUBCLASS,
BOOLEAN,
false
);

explicitDiscriminatorsForJoinedInheritanceSupported = !configService.getSetting(
AvailableSettings.IGNORE_EXPLICIT_DISCRIMINATOR_COLUMNS_FOR_JOINED_SUBCLASS,
MappingSettings.IGNORE_EXPLICIT_DISCRIMINATOR_COLUMNS_FOR_JOINED_SUBCLASS,
BOOLEAN,
false
);

implicitlyForceDiscriminatorInSelect = configService.getSetting(
AvailableSettings.FORCE_DISCRIMINATOR_IN_SELECTS_BY_DEFAULT,
MappingSettings.FORCE_DISCRIMINATOR_IN_SELECTS_BY_DEFAULT,
BOOLEAN,
false
);

sharedCacheMode = configService.getSetting(
AvailableSettings.JAKARTA_SHARED_CACHE_MODE,
CacheSettings.JAKARTA_SHARED_CACHE_MODE,
value -> value instanceof SharedCacheMode cacheMode
? cacheMode
: SharedCacheMode.valueOf( value.toString() ),
configService.getSetting(
AvailableSettings.JPA_SHARED_CACHE_MODE,
CacheSettings.JPA_SHARED_CACHE_MODE,
value -> {
if ( value == null ) {
return null;
}

DeprecationLogger.DEPRECATION_LOGGER.deprecatedSetting(
AvailableSettings.JPA_SHARED_CACHE_MODE,
AvailableSettings.JAKARTA_SHARED_CACHE_MODE
CacheSettings.JPA_SHARED_CACHE_MODE,
CacheSettings.JAKARTA_SHARED_CACHE_MODE
);

return value instanceof SharedCacheMode cacheMode
Expand All @@ -705,7 +710,7 @@ public MetadataBuildingOptionsImpl(StandardServiceRegistry serviceRegistry) {

final RegionFactory regionFactory = serviceRegistry.getService( RegionFactory.class );
defaultCacheAccessType = configService.getSetting(
AvailableSettings.DEFAULT_CACHE_CONCURRENCY_STRATEGY,
CacheSettings.DEFAULT_CACHE_CONCURRENCY_STRATEGY,
value -> {
if ( value == null ) {
return null;
Expand All @@ -724,15 +729,18 @@ else if ( value instanceof AccessType accessType ) {
regionFactory == null ? null : regionFactory.getDefaultAccessType()
);

noConstraintByDefault = ConstraintMode.NO_CONSTRAINT.name().equalsIgnoreCase( configService.getSetting(
AvailableSettings.HBM2DDL_DEFAULT_CONSTRAINT_MODE,
String.class,
final String defaultConstraintMode = configService.getSetting(
SchemaToolingSettings.HBM2DDL_DEFAULT_CONSTRAINT_MODE,
STRING,
null
) );
);
noConstraintByDefault =
ConstraintMode.NO_CONSTRAINT.name()
.equalsIgnoreCase( defaultConstraintMode );

implicitNamingStrategy = strategySelector.<ImplicitNamingStrategy>resolveDefaultableStrategy(
ImplicitNamingStrategy.class,
configService.getSettings().get( AvailableSettings.IMPLICIT_NAMING_STRATEGY ),
configService.getSettings().get( MappingSettings.IMPLICIT_NAMING_STRATEGY ),
() -> strategySelector.resolveDefaultableStrategy(
ImplicitNamingStrategy.class,
"default",
Expand All @@ -742,13 +750,13 @@ else if ( value instanceof AccessType accessType ) {

physicalNamingStrategy = strategySelector.resolveDefaultableStrategy(
PhysicalNamingStrategy.class,
configService.getSettings().get( AvailableSettings.PHYSICAL_NAMING_STRATEGY ),
configService.getSettings().get( MappingSettings.PHYSICAL_NAMING_STRATEGY ),
PhysicalNamingStrategyStandardImpl.INSTANCE
);

columnOrderingStrategy = strategySelector.<ColumnOrderingStrategy>resolveDefaultableStrategy(
ColumnOrderingStrategy.class,
configService.getSettings().get( AvailableSettings.COLUMN_ORDERING_STRATEGY ),
configService.getSettings().get( MappingSettings.COLUMN_ORDERING_STRATEGY ),
() -> strategySelector.resolveDefaultableStrategy(
ColumnOrderingStrategy.class,
"default",
Expand All @@ -757,19 +765,19 @@ else if ( value instanceof AccessType accessType ) {
);

useNationalizedCharacterData = configService.getSetting(
AvailableSettings.USE_NATIONALIZED_CHARACTER_DATA,
MappingSettings.USE_NATIONALIZED_CHARACTER_DATA,
BOOLEAN,
false
);

schemaCharset = configService.getSetting(
AvailableSettings.HBM2DDL_CHARSET_NAME,
String.class,
SchemaToolingSettings.HBM2DDL_CHARSET_NAME,
STRING,
null
);

allowExtensionsInCdi = configService.getSetting(
AvailableSettings.ALLOW_EXTENSIONS_IN_CDI,
ManagedBeanSettings.ALLOW_EXTENSIONS_IN_CDI,
BOOLEAN,
false
);
Expand Down Expand Up @@ -975,7 +983,7 @@ public void setBootstrapContext(BootstrapContext bootstrapContext) {
private static TimeZoneStorageType resolveTimeZoneStorageStrategy(
ConfigurationService configService) {
return configService.getSetting(
AvailableSettings.TIMEZONE_DEFAULT_STORAGE,
MappingSettings.TIMEZONE_DEFAULT_STORAGE,
value -> TimeZoneStorageType.valueOf( value.toString() ),
TimeZoneStorageType.DEFAULT
);
Expand All @@ -985,7 +993,7 @@ private static WrapperArrayHandling resolveWrapperArrayHandling(
ConfigurationService configService) {
return coalesceSuppliedValues(
() -> configService.getSetting(
WRAPPER_ARRAY_HANDLING,
MappingSettings.WRAPPER_ARRAY_HANDLING,
WrapperArrayHandling::interpretExternalSettingLeniently
),
() -> resolveFallbackWrapperArrayHandling( configService )
Expand All @@ -1005,7 +1013,7 @@ private static WrapperArrayHandling pickWrapperArrayHandling(Dialect dialect) {

private static WrapperArrayHandling resolveFallbackWrapperArrayHandling(
ConfigurationService configService) {
return configService.getSetting( JPA_COMPLIANCE, BOOLEAN, false )
return configService.getSetting( JpaComplianceSettings.JPA_COMPLIANCE, BOOLEAN, false )
? WrapperArrayHandling.PICK // JPA compliance was enabled. Use PICK
: WrapperArrayHandling.DISALLOW;
}
Expand Down
6 changes: 1 addition & 5 deletions ...ate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,7 @@ public void injectServices(ServiceRegistryImplementor serviceRegistry) {
@Override
public <T> @PolyNull T getSetting(String name, Converter<T> converter, @PolyNull T defaultValue) {
final Object value = settings.get( name );
if ( value == null ) {
return defaultValue;
}

return converter.convert( value );
return value == null ? defaultValue : converter.convert( value );
}

@Override
Expand Down
8 changes: 7 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/engine/config/spi/ConfigurationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ public interface ConfigurationService extends Service {
* @param converter The converter to apply
* @param <T> The Java type of the conversion
*
* @return The converted (typed) setting. May return {@code null} (see {@link #getSetting(String, Class, Object)})
* @return The converted (typed) setting.
* May return {@code null}
* (see {@link #getSetting(String, Class, Object)})
*/
<T> @Nullable T getSetting(String name, Converter<T> converter);

Expand All @@ -64,7 +66,11 @@ public interface ConfigurationService extends Service {
* @param <T> The Java type of the conversion
*
* @return The converted (typed) setting. Will be the defaultValue if no such setting was defined.
*
* @deprecated Use {@link #getSetting(String, Converter, Object)}.
* This method does not report errors correctly.
*/
@Deprecated(since = "7.2")
<T> @PolyNull T getSetting(String name, Class<T> expected, @PolyNull T defaultValue);

/**
Expand Down
Loading