missed some cleanup in SchemaTruncatorImpl

Author: gavinking

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

@@ -99,6 +99,7 @@
 import static org.hibernate.internal.util.config.ConfigurationHelper.getString;
 import static org.hibernate.jpa.internal.util.CacheModeHelper.interpretCacheMode;
 import static org.hibernate.jpa.internal.util.ConfigurationHelper.getFlushMode;
+import static org.hibernate.stat.Statistics.DEFAULT_QUERY_STATISTICS_MAX_SIZE;
 import static org.hibernate.type.format.jackson.JacksonIntegration.getJsonJacksonFormatMapperOrNull;
 import static org.hibernate.type.format.jackson.JacksonIntegration.getOsonJacksonFormatMapperOrNull;
 import static org.hibernate.type.format.jackson.JacksonIntegration.getXMLJacksonFormatMapperOrNull;
@@ -416,7 +417,8 @@ public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, Boo
 					strategySelector.resolveDefaultableStrategy( TimestampsCacheFactory.class,
 							settings.get( QUERY_CACHE_FACTORY ), StandardTimestampsCacheFactory.INSTANCE );
 			minimalPutsEnabled =
-					configurationService.getSetting( USE_MINIMAL_PUTS, BOOLEAN, regionFactory.isMinimalPutsEnabledByDefault() );
+					configurationService.getSetting( USE_MINIMAL_PUTS, BOOLEAN,
+							regionFactory.isMinimalPutsEnabledByDefault() );
 			structuredCacheEntriesEnabled =
 					configurationService.getSetting( USE_STRUCTURED_CACHE, BOOLEAN, false );
 			directReferenceCacheEntriesEnabled =
@@ -503,7 +505,7 @@ public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, Boo
 		xmlFunctionsEnabled = getBoolean( XML_FUNCTIONS_ENABLED, settings );
 
 		queryStatisticsMaxSize =
-				getInt( QUERY_STATISTICS_MAX_SIZE, settings, Statistics.DEFAULT_QUERY_STATISTICS_MAX_SIZE );
+				getInt( QUERY_STATISTICS_MAX_SIZE, settings, DEFAULT_QUERY_STATISTICS_MAX_SIZE );
 
 		unownedAssociationTransientCheck =
 				getBoolean( UNOWNED_ASSOCIATION_TRANSIENT_CHECK, settings, isJpaBootstrap() );

hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java

@@ -41,12 +41,9 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.TimestampJdbcType;
 import org.hibernate.type.descriptor.jdbc.TinyIntJdbcType;
-import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.hibernate.type.descriptor.sql.internal.CapacityDependentDdlType;
 import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaPopulator.java

@@ -67,7 +67,7 @@ private String getDefaultImportFile(ExecutionOptions options) {
 	}
 
 	private static boolean skipDefaultFileImport(ExecutionOptions options) {
-		return getBoolean( HBM2DDL_SKIP_DEFAULT_IMPORT_FILE, options.getConfigurationValues(), false );
+		return getBoolean( HBM2DDL_SKIP_DEFAULT_IMPORT_FILE, options.getConfigurationValues() );
 	}
 
 	/**
@@ -101,7 +101,8 @@ private boolean applyImportScript(
 		final Object importScriptSetting = getImportScriptSetting( options );
 		if ( importScriptSetting != null ) {
 			final var importScriptInput =
-					interpretScriptSourceSetting( importScriptSetting, getClassLoaderService(), getCharsetName( options ) );
+					interpretScriptSourceSetting( importScriptSetting,
+							getClassLoaderService(), getCharsetName( options ) );
 			applyScript(
 					options,
 					commandExtractor,

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaTruncatorImpl.java

@@ -13,7 +13,6 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.internal.FormatStyle;
 import org.hibernate.engine.jdbc.internal.Formatter;
-import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.mapping.Table;
 import org.hibernate.tool.schema.spi.GenerationTarget;
 import org.hibernate.tool.schema.spi.ContributableMatcher;
@@ -29,6 +28,7 @@
 import java.util.List;
 import java.util.Set;
 
+import static org.hibernate.internal.util.collections.CollectionHelper.setOfSize;
 import static org.hibernate.tool.schema.internal.Helper.applySqlString;
 import static org.hibernate.tool.schema.internal.Helper.applySqlStrings;
 import static org.hibernate.tool.schema.internal.Helper.createSqlStringGenerationContext;
@@ -110,9 +110,9 @@ private void truncateFromMetadata(
 			Formatter formatter,
 			GenerationTarget... targets) {
 		final var database = metadata.getDatabase();
-		SqlStringGenerationContext context = createSqlStringGenerationContext( options, metadata );
+		final var context = createSqlStringGenerationContext( options, metadata );
 
-		final Set<String> exportIdentifiers = CollectionHelper.setOfSize( 50 );
+		final Set<String> exportIdentifiers = setOfSize( 50 );
 
 		for ( var namespace : database.getNamespaces() ) {
 			if ( schemaFilter.includeNamespace( namespace ) ) {
@@ -121,19 +121,14 @@ private void truncateFromMetadata(
 				applySqlString( dialect.getTableCleaner().getSqlBeforeString(), formatter, options, targets );
 
 				// now it's safe to drop the tables
-				List<Table> list = new ArrayList<>( namespace.getTables().size() );
-				for ( Table table : namespace.getTables() ) {
-					if ( !table.isPhysicalTable() ) {
-						continue;
+				final List<Table> list = new ArrayList<>( namespace.getTables().size() );
+				for ( var table : namespace.getTables() ) {
+					if ( table.isPhysicalTable()
+							&& schemaFilter.includeTable( table )
+							&& contributableInclusionFilter.matches( table ) ) {
+						checkExportIdentifier( table, exportIdentifiers );
+						list.add( table );
 					}
-					if ( !schemaFilter.includeTable( table ) ) {
-						continue;
-					}
-					if ( !contributableInclusionFilter.matches( table ) ) {
-						continue;
-					}
-					checkExportIdentifier( table, exportIdentifiers );
-					list.add( table );
 				}
 				applySqlStrings(
 						dialect.getTableCleaner().getSqlTruncateStrings( list, metadata, context ),
@@ -175,7 +170,6 @@ private void disableConstraints(
 			ContributableMatcher contributableInclusionFilter,
 			GenerationTarget... targets) {
 		final var dialect = metadata.getDatabase().getJdbcEnvironment().getDialect();
-
 		for ( var table : namespace.getTables() ) {
 			if ( table.isPhysicalTable()
 					&& schemaFilter.includeTable( table )
@@ -213,8 +207,8 @@ private void enableConstraints(
 			SqlStringGenerationContext context,
 			ContributableMatcher contributableInclusionFilter,
 			GenerationTarget... targets) {
-		final Dialect dialect = metadata.getDatabase().getJdbcEnvironment().getDialect();
-		for ( Table table : namespace.getTables() ) {
+		final var dialect = metadata.getDatabase().getJdbcEnvironment().getDialect();
+		for ( var table : namespace.getTables() ) {
 			if ( table.isPhysicalTable()
 					&& schemaFilter.includeTable( table )
 					&& contributableInclusionFilter.matches( table ) ) {