missed some cleanup in SchemaTruncatorImpl

Author: gavinking

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

@@ -29,6 +29,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 +111,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 +122,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 +171,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 +208,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 ) ) {