Skip to content

Commit fb834e1

Browse files
gavinkinggavinking
committed
more cleanups to SessionFactoryOptionsBuilder
1 parent 59fcb37 commit fb834e1

File tree

1 file changed

+39
-52
lines changed

1 file changed

+39
-52
lines changed

‎hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java

Lines changed: 39 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.hibernate.cache.internal.StandardTimestampsCacheFactory;
4545
import org.hibernate.cache.spi.RegionFactory;
4646
import org.hibernate.cache.spi.TimestampsCacheFactory;
47-
import org.hibernate.cfg.AvailableSettings;
4847
import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
4948
import org.hibernate.dialect.Dialect;
5049
import org.hibernate.engine.config.spi.ConfigurationService;
@@ -53,7 +52,6 @@
5352
import org.hibernate.engine.jdbc.spi.JdbcServices;
5453
import org.hibernate.id.uuid.LocalObjectUuidHelper;
5554
import org.hibernate.internal.BaselineSessionEventsListenerBuilder;
56-
import org.hibernate.internal.CoreMessageLogger;
5755
import org.hibernate.internal.EmptyInterceptor;
5856
import org.hibernate.internal.util.NullnessHelper;
5957
import org.hibernate.internal.util.config.ConfigurationHelper;
@@ -87,22 +85,8 @@
8785
import static java.util.Collections.unmodifiableMap;
8886
import static org.hibernate.Timeouts.WAIT_FOREVER_MILLI;
8987
import static org.hibernate.cfg.AvailableSettings.*;
90-
import static org.hibernate.cfg.AvailableSettings.JAKARTA_LOCK_SCOPE;
91-
import static org.hibernate.cfg.AvailableSettings.JAKARTA_LOCK_TIMEOUT;
92-
import static org.hibernate.cfg.AvailableSettings.JPA_LOCK_TIMEOUT;
93-
import static org.hibernate.cfg.CacheSettings.JAKARTA_SHARED_CACHE_RETRIEVE_MODE;
94-
import static org.hibernate.cfg.CacheSettings.JAKARTA_SHARED_CACHE_STORE_MODE;
95-
import static org.hibernate.cfg.CacheSettings.JPA_SHARED_CACHE_RETRIEVE_MODE;
96-
import static org.hibernate.cfg.CacheSettings.JPA_SHARED_CACHE_STORE_MODE;
97-
import static org.hibernate.cfg.CacheSettings.QUERY_CACHE_LAYOUT;
9888
import static org.hibernate.cfg.DialectSpecificSettings.ORACLE_OSON_DISABLED;
99-
import static org.hibernate.cfg.PersistenceSettings.UNOWNED_ASSOCIATION_TRANSIENT_CHECK;
100-
import static org.hibernate.cfg.QuerySettings.DEFAULT_NULL_ORDERING;
101-
import static org.hibernate.cfg.QuerySettings.JSON_FUNCTIONS_ENABLED;
102-
import static org.hibernate.cfg.QuerySettings.PORTABLE_INTEGER_DIVISION;
103-
import static org.hibernate.cfg.QuerySettings.XML_FUNCTIONS_ENABLED;
10489
import static org.hibernate.engine.config.spi.StandardConverters.BOOLEAN;
105-
import static org.hibernate.internal.CoreLogging.messageLogger;
10690
import static org.hibernate.internal.LockOptionsHelper.applyPropertiesToLockOptions;
10791
import static org.hibernate.internal.log.DeprecationLogger.DEPRECATION_LOGGER;
10892
import static org.hibernate.internal.util.PropertiesHelper.map;
@@ -131,7 +115,6 @@
131115
* @author Steve Ebersole
132116
*/
133117
public class SessionFactoryOptionsBuilder implements SessionFactoryOptions {
134-
private static final CoreMessageLogger log = messageLogger( SessionFactoryOptionsBuilder.class );
135118

136119
private final String uuid = LocalObjectUuidHelper.generateLocalObjectUuid();
137120
private final StandardServiceRegistry serviceRegistry;
@@ -291,35 +274,34 @@ public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, Boo
291274
settings.putAll( configurationService.getSettings() );
292275

293276
beanManagerReference = NullnessHelper.coalesceSuppliedValues(
294-
() -> settings.get( AvailableSettings.JAKARTA_CDI_BEAN_MANAGER ),
277+
() -> settings.get( JAKARTA_CDI_BEAN_MANAGER ),
295278
() -> {
296-
final Object value = settings.get( AvailableSettings.CDI_BEAN_MANAGER );
279+
final Object value = settings.get( CDI_BEAN_MANAGER );
297280
if ( value != null ) {
298-
DEPRECATION_LOGGER.deprecatedSetting(
299-
AvailableSettings.CDI_BEAN_MANAGER,
300-
AvailableSettings.JAKARTA_CDI_BEAN_MANAGER
301-
);
281+
DEPRECATION_LOGGER.deprecatedSetting( CDI_BEAN_MANAGER,
282+
JAKARTA_CDI_BEAN_MANAGER );
302283
}
303284
return value;
304285
}
305286
);
306287

307288
validatorFactoryReference = settings.getOrDefault(
308-
AvailableSettings.JPA_VALIDATION_FACTORY,
309-
settings.get( AvailableSettings.JAKARTA_VALIDATION_FACTORY )
289+
JPA_VALIDATION_FACTORY,
290+
settings.get( JAKARTA_VALIDATION_FACTORY )
310291
);
311292

312293
jsonFormatMapper = jsonFormatMapper(
313-
settings.get( AvailableSettings.JSON_FORMAT_MAPPER ),
314-
!getBoolean( ORACLE_OSON_DISABLED ,settings),
294+
settings.get( JSON_FORMAT_MAPPER ),
295+
!getBoolean( ORACLE_OSON_DISABLED, settings),
315296
strategySelector
316297
);
317298

318299
xmlFormatMapper = xmlFormatMapper(
319-
settings.get( AvailableSettings.XML_FORMAT_MAPPER ),
300+
settings.get( XML_FORMAT_MAPPER ),
320301
strategySelector,
321302
xmlFormatMapperLegacyFormatEnabled =
322-
context.getMetadataBuildingOptions().isXmlFormatMapperLegacyFormatEnabled()
303+
context.getMetadataBuildingOptions()
304+
.isXmlFormatMapperLegacyFormatEnabled()
323305
);
324306

325307
sessionFactoryName = (String) settings.get( SESSION_FACTORY_NAME );
@@ -395,19 +377,19 @@ public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, Boo
395377
jtaTrackByThread = configurationService.getSetting( JTA_TRACK_BY_THREAD, BOOLEAN, true );
396378

397379
final String hqlTranslatorImplFqn =
398-
extractPropertyValue( AvailableSettings.SEMANTIC_QUERY_PRODUCER, settings );
380+
extractPropertyValue( SEMANTIC_QUERY_PRODUCER, settings );
399381
hqlTranslator = resolveHqlTranslator( hqlTranslatorImplFqn, serviceRegistry, strategySelector );
400382

401383
final String sqmTranslatorFactoryImplFqn =
402-
extractPropertyValue( AvailableSettings.SEMANTIC_QUERY_TRANSLATOR, settings );
384+
extractPropertyValue( SEMANTIC_QUERY_TRANSLATOR, settings );
403385
sqmTranslatorFactory = resolveSqmTranslator( sqmTranslatorFactoryImplFqn, strategySelector );
404386

405387
final String sqmMutationStrategyImplName =
406-
extractPropertyValue( AvailableSettings.QUERY_MULTI_TABLE_MUTATION_STRATEGY, settings );
388+
extractPropertyValue( QUERY_MULTI_TABLE_MUTATION_STRATEGY, settings );
407389
sqmMultiTableMutationStrategy =
408390
resolveSqmMutationStrategy( sqmMutationStrategyImplName, serviceRegistry, strategySelector );
409391
final String sqmInsertStrategyImplName =
410-
extractPropertyValue( AvailableSettings.QUERY_MULTI_TABLE_INSERT_STRATEGY, settings );
392+
extractPropertyValue( QUERY_MULTI_TABLE_INSERT_STRATEGY, settings );
411393
sqmMultiTableInsertStrategy =
412394
resolveSqmInsertStrategy( sqmInsertStrategyImplName, serviceRegistry, strategySelector );
413395

@@ -461,25 +443,18 @@ public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, Boo
461443
autoEvictCollectionCache = false;
462444
}
463445

464-
// deprecated
446+
// deprecated, delete this:
465447
try {
466-
schemaAutoTooling = SchemaAutoTooling.interpret( (String) settings.get( AvailableSettings.HBM2DDL_AUTO ) );
448+
schemaAutoTooling = SchemaAutoTooling.interpret( (String) settings.get( HBM2DDL_AUTO ) );
467449
}
468450
catch (Exception e) {
469-
log.warn( e.getMessage() + " Ignoring" );
451+
// ignore, since this member is deprecated and ignored
470452
}
471453

454+
final var meta = jdbcServices.getExtractedMetaDataSupport();
455+
472456
// deprecated
473-
final ExtractedDatabaseMetaData meta = jdbcServices.getExtractedMetaDataSupport();
474-
if ( meta.doesDataDefinitionCauseTransactionCommit() ) {
475-
tempTableDdlTransactionHandling =
476-
meta.supportsDataDefinitionInTransaction()
477-
? TempTableDdlTransactionHandling.ISOLATE_AND_TRANSACT
478-
: TempTableDdlTransactionHandling.ISOLATE;
479-
}
480-
else {
481-
tempTableDdlTransactionHandling = TempTableDdlTransactionHandling.NONE;
482-
}
457+
tempTableDdlTransactionHandling = getTempTableDdlTransactionHandling( meta );
483458

484459
jdbcBatchSize = disallowBatchUpdates( dialect, meta ) ? 0
485460
: getInt( STATEMENT_BATCH_SIZE, settings, 1 );
@@ -494,7 +469,7 @@ public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, Boo
494469
connectionHandlingMode = interpretConnectionHandlingMode( settings, serviceRegistry );
495470

496471
connectionProviderDisablesAutoCommit =
497-
getBoolean( AvailableSettings.CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT, settings, false );
472+
getBoolean( CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT, settings, false );
498473

499474
commentsEnabled = getBoolean( USE_SQL_COMMENTS, settings );
500475

@@ -510,11 +485,11 @@ public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, Boo
510485
jdbcTimeZone = getJdbcTimeZone( settings.get( JDBC_TIME_ZONE ) );
511486

512487
criteriaValueHandlingMode = ValueHandlingMode.interpret( settings.get( CRITERIA_VALUE_HANDLING_MODE ) );
513-
criteriaCopyTreeEnabled = getBoolean( AvailableSettings.CRITERIA_COPY_TREE, settings, jpaBootstrap );
514-
criteriaPlanCacheEnabled = getBoolean( AvailableSettings.CRITERIA_PLAN_CACHE_ENABLED, settings, false );
488+
criteriaCopyTreeEnabled = getBoolean( CRITERIA_COPY_TREE, settings, jpaBootstrap );
489+
criteriaPlanCacheEnabled = getBoolean( CRITERIA_PLAN_CACHE_ENABLED, settings, false );
515490

516491
nativeJdbcParametersIgnored =
517-
getBoolean( AvailableSettings.NATIVE_IGNORE_JDBC_PARAMETERS, settings, false );
492+
getBoolean( NATIVE_IGNORE_JDBC_PARAMETERS, settings, false );
518493

519494
// added the boolean parameter in case we want to define some form of "all" as discussed
520495
jpaCompliance = context.getJpaCompliance();
@@ -542,10 +517,10 @@ public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, Boo
542517
getBoolean( UNOWNED_ASSOCIATION_TRANSIENT_CHECK, settings, isJpaBootstrap() );
543518

544519
passProcedureParameterNames =
545-
getBoolean( AvailableSettings.QUERY_PASS_PROCEDURE_PARAMETER_NAMES, settings, false );
520+
getBoolean( QUERY_PASS_PROCEDURE_PARAMETER_NAMES, settings, false );
546521

547522
preferJdbcDatetimeTypes =
548-
getBoolean( AvailableSettings.NATIVE_PREFER_JDBC_DATETIME_TYPES, settings, false );
523+
getBoolean( NATIVE_PREFER_JDBC_DATETIME_TYPES, settings, false );
549524

550525
defaultSessionProperties = initializeDefaultSessionProperties( configurationService );
551526

@@ -557,6 +532,18 @@ public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, Boo
557532
initialSessionFlushMode = defaultFlushMode( defaultSessionProperties );
558533
}
559534

535+
@Deprecated(forRemoval = true)
536+
private static TempTableDdlTransactionHandling getTempTableDdlTransactionHandling(ExtractedDatabaseMetaData meta) {
537+
if ( meta.doesDataDefinitionCauseTransactionCommit() ) {
538+
return meta.supportsDataDefinitionInTransaction()
539+
? TempTableDdlTransactionHandling.ISOLATE_AND_TRANSACT
540+
: TempTableDdlTransactionHandling.ISOLATE;
541+
}
542+
else {
543+
return TempTableDdlTransactionHandling.NONE;
544+
}
545+
}
546+
560547
private TimeZone getJdbcTimeZone(Object jdbcTimeZoneValue) {
561548
if ( jdbcTimeZoneValue instanceof TimeZone timeZone ) {
562549
return timeZone;

0 commit comments

Comments
 (0)