Skip to content

misc code cleanups #11249

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 2 commits into from
Nov 15, 2025
Merged

misc code cleanups #11249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77cc8a0
cleaner code by adding some static imports
gavinking Nov 15, 2025
2aa8c84
remove obsolete and deprecated methods from an internal utility class
gavinking Nov 15, 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
48 changes: 22 additions & 26 deletions hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,16 @@
import org.hibernate.Incubating;
import org.hibernate.boot.model.TypeDefinitionRegistry;
import org.hibernate.boot.model.naming.ObjectNameNormalizer;
import org.hibernate.cfg.MappingSettings;
import org.hibernate.boot.registry.StandardServiceRegistry;
import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.ServiceRegistry;

import static org.hibernate.cfg.MappingSettings.JAVA_TIME_USE_DIRECT_JDBC;
import static org.hibernate.cfg.MappingSettings.PREFER_LOCALE_LANGUAGE_TAG;
import static org.hibernate.cfg.MappingSettings.PREFER_NATIVE_ENUM_TYPES;
import static org.hibernate.internal.util.config.ConfigurationHelper.getBoolean;

/**
* Describes the context in which the process of building {@link org.hibernate.boot.Metadata}
* from {@link org.hibernate.boot.MetadataSources} occurs.
Expand Down Expand Up @@ -53,44 +58,48 @@ public interface MetadataBuildingContext {
*/
ObjectNameNormalizer getObjectNameNormalizer();

private StandardServiceRegistry getRegistry() {
return getBootstrapContext().getServiceRegistry();
}

@Incubating
default int getPreferredSqlTypeCodeForBoolean() {
return ConfigurationHelper.getPreferredSqlTypeCodeForBoolean( getBootstrapContext().getServiceRegistry() );
return ConfigurationHelper.getPreferredSqlTypeCodeForBoolean( getRegistry() );
}

@Incubating
default int getPreferredSqlTypeCodeForDuration() {
return ConfigurationHelper.getPreferredSqlTypeCodeForDuration( getBootstrapContext().getServiceRegistry() );
return ConfigurationHelper.getPreferredSqlTypeCodeForDuration( getRegistry() );
}

@Incubating
default int getPreferredSqlTypeCodeForUuid() {
return ConfigurationHelper.getPreferredSqlTypeCodeForUuid( getBootstrapContext().getServiceRegistry() );
return ConfigurationHelper.getPreferredSqlTypeCodeForUuid( getRegistry() );
}

@Incubating
default int getPreferredSqlTypeCodeForInstant() {
return ConfigurationHelper.getPreferredSqlTypeCodeForInstant( getBootstrapContext().getServiceRegistry() );
return ConfigurationHelper.getPreferredSqlTypeCodeForInstant( getRegistry() );
}

@Incubating
default int getPreferredSqlTypeCodeForArray() {
return ConfigurationHelper.getPreferredSqlTypeCodeForArray( getBootstrapContext().getServiceRegistry() );
return ConfigurationHelper.getPreferredSqlTypeCodeForArray( getRegistry() );
}

@Incubating
default boolean isPreferJavaTimeJdbcTypesEnabled() {
return isPreferJavaTimeJdbcTypesEnabled( getBootstrapContext().getServiceRegistry() );
return isPreferJavaTimeJdbcTypesEnabled( getRegistry() );
}

@Incubating
default boolean isPreferNativeEnumTypesEnabled() {
return isPreferNativeEnumTypesEnabled( getBootstrapContext().getServiceRegistry() );
return isPreferNativeEnumTypesEnabled( getRegistry() );
}

@Incubating
default boolean isPreferLocaleLanguageTagEnabled() {
return isPreferLocaleLanguageTagEnabled( getBootstrapContext().getServiceRegistry() );
return isPreferLocaleLanguageTagEnabled( getRegistry() );
}

static boolean isPreferJavaTimeJdbcTypesEnabled(ServiceRegistry serviceRegistry) {
Expand All @@ -106,29 +115,16 @@ static boolean isPreferLocaleLanguageTagEnabled(ServiceRegistry serviceRegistry)
}

static boolean isPreferJavaTimeJdbcTypesEnabled(ConfigurationService configurationService) {
return ConfigurationHelper.getBoolean(
MappingSettings.JAVA_TIME_USE_DIRECT_JDBC,
configurationService.getSettings(),
// todo : true would be better eventually so maybe just rip off that band aid
false
);
return getBoolean( JAVA_TIME_USE_DIRECT_JDBC, configurationService.getSettings() );
}

static boolean isPreferNativeEnumTypesEnabled(ConfigurationService configurationService) {
return ConfigurationHelper.getBoolean(
MappingSettings.PREFER_NATIVE_ENUM_TYPES,
configurationService.getSettings(),
// todo: switch to true with HHH-17905
false
);
//TODO: HHH-17905 proposes to switch this default to true
return getBoolean( PREFER_NATIVE_ENUM_TYPES, configurationService.getSettings() );
}

static boolean isPreferLocaleLanguageTagEnabled(ConfigurationService configurationService) {
return ConfigurationHelper.getBoolean(
MappingSettings.PREFER_LOCALE_LANGUAGE_TAG,
configurationService.getSettings(),
false
);
return getBoolean( PREFER_LOCALE_LANGUAGE_TAG, configurationService.getSettings() );
}

TypeDefinitionRegistry getTypeDefinitionRegistry();
Expand Down
Loading