From 9b4ed961b8d828ec2095c7576ba41fd7c6f27bfc Mon Sep 17 00:00:00 2001 From: Gavin Date: Fri, 12 May 2023 18:09:28 +0200 Subject: [PATCH] false is the default for getBoolean() --- .../internal/SessionFactoryOptionsBuilder.java | 14 +++++--------- .../DriverManagerConnectionProviderImpl.java | 8 ++------ .../jdbc/internal/SqlStatementLoggerInitiator.java | 6 +++--- .../id/enhanced/SequenceStyleGenerator.java | 2 +- .../org/hibernate/id/enhanced/TableGenerator.java | 2 +- .../org/hibernate/internal/SessionFactoryImpl.java | 3 +-- .../jpa/internal/MutableJpaComplianceImpl.java | 6 +----- .../internal/EmbeddableMappingTypeImpl.java | 3 +-- .../hibernate/query/internal/NamedQueryHelper.java | 4 ++-- .../internal/ParameterMarkerStrategyInitiator.java | 3 +-- .../tool/schema/JdbcMetadaAccessStrategy.java | 2 +- .../internal/AbstractInformationExtractorImpl.java | 2 +- .../org/hibernate/tool/schema/internal/Helper.java | 6 ++---- 13 files changed, 22 insertions(+), 39 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java index 31fda41536..bc68418fdb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java @@ -511,18 +511,16 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions { this.commentsEnabled = getBoolean( USE_SQL_COMMENTS, configurationSettings ); - this.preferUserTransaction = getBoolean( PREFER_USER_TRANSACTION, configurationSettings, false ); + this.preferUserTransaction = getBoolean( PREFER_USER_TRANSACTION, configurationSettings ); this.allowOutOfTransactionUpdateOperations = getBoolean( ALLOW_UPDATE_OUTSIDE_TRANSACTION, - configurationSettings, - false + configurationSettings ); this.releaseResourcesOnCloseEnabled = getBoolean( DISCARD_PC_ON_CLOSE, - configurationSettings, - false + configurationSettings ); Object jdbcTimeZoneValue = configurationSettings.get( @@ -556,8 +554,7 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions { this.failOnPaginationOverCollectionFetchEnabled = getBoolean( FAIL_ON_PAGINATION_OVER_COLLECTION_FETCH, - configurationSettings, - false + configurationSettings ); this.immutableEntityUpdateQueryHandlingMode = ImmutableEntityUpdateQueryHandlingMode.interpret( @@ -569,8 +566,7 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions { this.inClauseParameterPaddingEnabled = getBoolean( IN_CLAUSE_PARAMETER_PADDING, - configurationSettings, - false + configurationSettings ); this.queryStatisticsMaxSize = getInt( diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java index 907bbac14e..6ecc7a2b75 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java @@ -84,11 +84,7 @@ public class DriverManagerConnectionProviderImpl } private PooledConnections buildPool(Map configurationValues, ServiceRegistryImplementor serviceRegistry) { - final boolean autoCommit = ConfigurationHelper.getBoolean( - AvailableSettings.AUTOCOMMIT, - configurationValues, - false - ); + final boolean autoCommit = ConfigurationHelper.getBoolean( AvailableSettings.AUTOCOMMIT, configurationValues ); final int minSize = ConfigurationHelper.getInt( MIN_SIZE, configurationValues, 1 ); final int maxSize = ConfigurationHelper.getInt( AvailableSettings.POOL_SIZE, configurationValues, 20 ); final int initialSize = ConfigurationHelper.getInt( INITIAL_SIZE, configurationValues, minSize ); @@ -170,7 +166,7 @@ public class DriverManagerConnectionProviderImpl CONNECTIONS_MESSAGE_LOGGER.connectionProperties( ConfigurationHelper.maskOut( connectionProps, "password" ) ); } - final boolean autoCommit = ConfigurationHelper.getBoolean( AvailableSettings.AUTOCOMMIT, configurationValues, false ); + final boolean autoCommit = ConfigurationHelper.getBoolean( AvailableSettings.AUTOCOMMIT, configurationValues ); CONNECTIONS_MESSAGE_LOGGER.autoCommitMode( autoCommit ); final Integer isolation = ConnectionProviderInitiator.extractIsolation( configurationValues ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/SqlStatementLoggerInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/SqlStatementLoggerInitiator.java index f0dae22c82..3615ed9e56 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/SqlStatementLoggerInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/SqlStatementLoggerInitiator.java @@ -26,9 +26,9 @@ public class SqlStatementLoggerInitiator implements StandardServiceInitiator configValues, ServiceRegistryImplementor registry) { - final boolean showSQL = ConfigurationHelper.getBoolean( Environment.SHOW_SQL, configValues, false ); - final boolean formatSQL = ConfigurationHelper.getBoolean( Environment.FORMAT_SQL, configValues, false ); - final boolean highlightSQL = ConfigurationHelper.getBoolean( Environment.HIGHLIGHT_SQL, configValues, false ); + final boolean showSQL = ConfigurationHelper.getBoolean( Environment.SHOW_SQL, configValues ); + final boolean formatSQL = ConfigurationHelper.getBoolean( Environment.FORMAT_SQL, configValues ); + final boolean highlightSQL = ConfigurationHelper.getBoolean( Environment.HIGHLIGHT_SQL, configValues ); final long logSlowQuery = ConfigurationHelper.getLong( Environment.LOG_SLOW_QUERY, configValues, 0 ); return new SqlStatementLogger( showSQL, formatSQL, highlightSQL, logSlowQuery ); diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java index 5f4e29d9a1..cf7bc6aa24 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java @@ -193,7 +193,6 @@ public class SequenceStyleGenerator final Dialect dialect = jdbcEnvironment.getDialect(); this.identifierType = type; - boolean forceTableUse = ConfigurationHelper.getBoolean( FORCE_TBL_PARAM, parameters, false ); final QualifiedName sequenceName = determineSequenceName(parameters, dialect, jdbcEnvironment, serviceRegistry ); @@ -204,6 +203,7 @@ public class SequenceStyleGenerator final boolean isPooledOptimizer = OptimizerFactory.isPooledOptimizer( optimizationStrategy ); + boolean forceTableUse = ConfigurationHelper.getBoolean( FORCE_TBL_PARAM, parameters ); SequenceMismatchStrategy sequenceMismatchStrategy = configurationService.getSetting( AvailableSettings.SEQUENCE_INCREMENT_SIZE_MISMATCH_STRATEGY, diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java index d6fca64eec..8357f6a5ea 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java @@ -487,7 +487,7 @@ public class TableGenerator implements PersistentIdentifierGenerator { * @return The default segment value to use. */ protected String determineDefaultSegmentValue(Properties params) { - final boolean preferSegmentPerEntity = getBoolean( CONFIG_PREFER_SEGMENT_PER_ENTITY, params, false ); + final boolean preferSegmentPerEntity = getBoolean( CONFIG_PREFER_SEGMENT_PER_ENTITY, params ); final String defaultToUse = preferSegmentPerEntity ? params.getProperty( TABLE ) : DEF_SEGMENT_VALUE; LOG.usingDefaultIdGeneratorSegmentValue( qualifiedTableName.render(), segmentColumnName, defaultToUse ); return defaultToUse; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java index fd18d73f90..4ac9764a30 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java @@ -1614,8 +1614,7 @@ public class SessionFactoryImpl extends QueryParameterBindingTypeResolverImpl im } private void logIfEmptyCompositesEnabled(Map props ) { - final boolean isEmptyCompositesEnabled = - getBoolean( CREATE_EMPTY_COMPOSITES_ENABLED, props, false ); + final boolean isEmptyCompositesEnabled = getBoolean( CREATE_EMPTY_COMPOSITES_ENABLED, props ); if ( isEmptyCompositesEnabled ) { LOG.emptyCompositesEnabled(); } diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/MutableJpaComplianceImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/MutableJpaComplianceImpl.java index 6d997654af..c3a4d3e4c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/MutableJpaComplianceImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/MutableJpaComplianceImpl.java @@ -30,11 +30,7 @@ public class MutableJpaComplianceImpl implements MutableJpaCompliance { public MutableJpaComplianceImpl(Map configurationSettings) { this( configurationSettings, - ConfigurationHelper.getBoolean( - AvailableSettings.JPA_COMPLIANCE, - configurationSettings, - false - ) + ConfigurationHelper.getBoolean( AvailableSettings.JPA_COMPLIANCE, configurationSettings ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java index 5534cb19bc..d4fe1bfd7f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java @@ -166,8 +166,7 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme this.createEmptyCompositesEnabled = ConfigurationHelper.getBoolean( Environment.CREATE_EMPTY_COMPOSITES_ENABLED, - creationContext.getServiceRegistry().getService( ConfigurationService.class ).getSettings(), - false + creationContext.getServiceRegistry().getService( ConfigurationService.class ).getSettings() ); final AggregateColumn aggregateColumn = bootDescriptor.getAggregateColumn(); if ( aggregateColumn != null ) { diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java b/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java index 6d1fbd8676..f8b29c6c78 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java @@ -61,7 +61,7 @@ public class NamedQueryHelper { cacheMode = cacheable ? determineCacheMode( hints, sessionFactory ) : null; flushMode = determineFlushMode( hints, sessionFactory ); - readOnly = ConfigurationHelper.getBoolean( HINT_READ_ONLY, hints, false ); + readOnly = ConfigurationHelper.getBoolean( HINT_READ_ONLY, hints ); lockOptions = determineLockOptions( hints, sessionFactory ); @@ -152,7 +152,7 @@ public class NamedQueryHelper { private static boolean isCacheable(Map hints, SessionFactoryImplementor sessionFactory) { return sessionFactory.getSessionFactoryOptions().isQueryCacheEnabled() - && ConfigurationHelper.getBoolean( HINT_CACHEABLE, hints, false ); + && ConfigurationHelper.getBoolean( HINT_CACHEABLE, hints ); } private static String determineCacheRegion(Map hints, SessionFactoryImplementor sessionFactory) { diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/ParameterMarkerStrategyInitiator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/ParameterMarkerStrategyInitiator.java index 6006e9a868..805d0c2d4a 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/ParameterMarkerStrategyInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/ParameterMarkerStrategyInitiator.java @@ -29,8 +29,7 @@ public class ParameterMarkerStrategyInitiator implements StandardServiceInitiato public ParameterMarkerStrategy initiateService(Map configurationValues, ServiceRegistryImplementor registry) { final boolean useNativeMarkers = ConfigurationHelper.getBoolean( AvailableSettings.DIALECT_NATIVE_PARAM_MARKERS, - configurationValues, - false + configurationValues ); if ( useNativeMarkers ) { diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java index 3002083342..725450dd7d 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java @@ -47,7 +47,7 @@ public enum JdbcMetadaAccessStrategy { if ( options == null ) { return interpretHbm2ddlSetting( null ); } - else if ( ConfigurationHelper.getBoolean( AvailableSettings.ENABLE_SYNONYMS, options, false ) ) { + else if ( ConfigurationHelper.getBoolean( AvailableSettings.ENABLE_SYNONYMS, options ) ) { // Use of synonyms can cause issues during schema validation or schema update when GROUPED strategy is used (especially in Oracle) return INDIVIDUALLY; } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/AbstractInformationExtractorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/AbstractInformationExtractorImpl.java index 2d7dc7ea66..464db1de9e 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/AbstractInformationExtractorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/AbstractInformationExtractorImpl.java @@ -104,7 +104,7 @@ public abstract class AbstractInformationExtractorImpl implements InformationExt final List tableTypesList = new ArrayList<>(); tableTypesList.add( "TABLE" ); tableTypesList.add( "VIEW" ); - if ( ConfigurationHelper.getBoolean( AvailableSettings.ENABLE_SYNONYMS, configService.getSettings(), false ) ) { + if ( ConfigurationHelper.getBoolean( AvailableSettings.ENABLE_SYNONYMS, configService.getSettings() ) ) { if ( dialect instanceof DB2Dialect ) { tableTypesList.add( "ALIAS" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java index efa2060639..5702bcfa1d 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java @@ -162,8 +162,7 @@ public class Helper { //Then try the Hibernate ORM setting: ConfigurationHelper.getBoolean( AvailableSettings.HBM2DDL_CREATE_NAMESPACES, - configurationValues, - false + configurationValues ) ) ); @@ -172,8 +171,7 @@ public class Helper { public static boolean interpretFormattingEnabled(Map configurationValues) { return ConfigurationHelper.getBoolean( AvailableSettings.FORMAT_SQL, - configurationValues, - false + configurationValues ); }