Skip to content

Commit 61f9f9a

Browse files
gavinkinggavinking
committed
minor cleanups in o.h.tool.schema.internal
mostly var and final
1 parent 57ee220 commit 61f9f9a

File tree

8 files changed

+57
-54
lines changed

8 files changed

+57
-54
lines changed

‎hibernate-core/src/main/java/org/hibernate/tool/schema/SourceType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public static SourceType interpret(Object value, SourceType defaultValue) {
7777
if ( name.isEmpty() ) {
7878
return METADATA;
7979
}
80-
for ( SourceType sourceType: values() ) {
80+
for ( var sourceType: values() ) {
8181
if ( sourceType.toString().equalsIgnoreCase(name) ) {
8282
return sourceType;
8383
}

‎hibernate-core/src/main/java/org/hibernate/tool/schema/UniqueConstraintSchemaUpdateStrategy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static UniqueConstraintSchemaUpdateStrategy interpret(Object setting) {
5757
}
5858

5959
try {
60-
final UniqueConstraintSchemaUpdateStrategy byName = byName( setting.toString() );
60+
final var byName = byName( setting.toString() );
6161
if ( byName != null ) {
6262
return byName;
6363
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import static org.hibernate.internal.util.collections.CollectionHelper.setOfSize;
5050
import static org.hibernate.tool.schema.UniqueConstraintSchemaUpdateStrategy.DROP_RECREATE_QUIETLY;
5151
import static org.hibernate.tool.schema.UniqueConstraintSchemaUpdateStrategy.SKIP;
52-
import static org.hibernate.tool.schema.internal.Helper.buildDatabaseInformation;
5352
import static org.hibernate.tool.schema.internal.Helper.interpretFormattingEnabled;
5453
import static org.hibernate.tool.schema.internal.SchemaCreatorImpl.createUserDefinedTypes;
5554
import static org.hibernate.tool.schema.internal.SchemaDropperImpl.dropUserDefinedTypes;
@@ -520,8 +519,8 @@ protected void createSchemaAndCatalog(
520519
SqlStringGenerationContext context,
521520
GenerationTarget[] targets) {
522521
if ( tryToCreateCatalogs || tryToCreateSchemas ) {
523-
Namespace.Name logicalName = namespace.getName();
524-
Namespace.Name physicalName = namespace.getPhysicalName();
522+
final var logicalName = namespace.getName();
523+
final var physicalName = namespace.getPhysicalName();
525524

526525
if ( tryToCreateCatalogs ) {
527526
final Identifier catalogLogicalName = logicalName.catalog();

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void applyImportSources(
4545
Dialect dialect,
4646
GenerationTarget... targets) {
4747
final var formatter = getImportScriptFormatter(format);
48-
boolean hasDefaultImportFileScriptBeenExecuted = applyImportScript(
48+
final boolean hasDefaultImportFileScriptBeenExecuted = applyImportScript(
4949
options,
5050
commandExtractor,
5151
dialect,
@@ -123,8 +123,11 @@ private boolean containsDefaultImportFile(ScriptSourceInput importScriptInput,Ex
123123
return false;
124124
}
125125
else {
126-
final URL defaultImportFileUrl = getClassLoaderService().locateResource( DEFAULT_IMPORT_FILE );
127-
return defaultImportFileUrl != null && importScriptInput.containsScript( defaultImportFileUrl );
126+
final URL defaultImportFileUrl =
127+
getClassLoaderService()
128+
.locateResource( DEFAULT_IMPORT_FILE );
129+
return defaultImportFileUrl != null
130+
&& importScriptInput.containsScript( defaultImportFileUrl );
128131
}
129132
}
130133

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,17 @@ public static ScriptSourceInput interpretScriptSourceSetting(
6363
else {
6464
final String scriptSourceSettingString = scriptSourceSetting.toString();
6565
CORE_LOGGER.attemptingToResolveScriptSourceSetting( scriptSourceSettingString );
66-
final String[] paths = splitAtCommas( scriptSourceSettingString );
66+
final var paths = splitAtCommas( scriptSourceSettingString );
6767
if ( paths.length == 1 ) {
6868
return interpretScriptSourceSetting( scriptSourceSettingString, classLoaderService, charsetName );
6969
}
70-
final var inputs = new AbstractScriptSourceInput[paths.length];
71-
for ( int i = 0; i < paths.length; i++ ) {
72-
inputs[i] = interpretScriptSourceSetting( paths[i], classLoaderService, charsetName ) ;
70+
else {
71+
final var inputs = new AbstractScriptSourceInput[paths.length];
72+
for ( int i = 0; i < paths.length; i++ ) {
73+
inputs[i] = interpretScriptSourceSetting( paths[i], classLoaderService, charsetName );
74+
}
75+
return new ScriptSourceInputAggregate( inputs );
7376
}
74-
return new ScriptSourceInputAggregate( inputs );
7577
}
7678
}
7779

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.hibernate.service.spi.ServiceRegistryImplementor;
3131
import org.hibernate.tool.schema.SourceType;
3232
import org.hibernate.tool.schema.spi.GenerationTarget;
33-
import org.hibernate.tool.schema.internal.exec.JdbcContext;
3433
import org.hibernate.tool.schema.spi.ContributableMatcher;
3534
import org.hibernate.tool.schema.spi.ExceptionHandler;
3635
import org.hibernate.tool.schema.spi.ExecutionOptions;
@@ -94,7 +93,7 @@ public void doCreation(
9493
TargetDescriptor targetDescriptor) {
9594
if ( !targetDescriptor.getTargetTypes().isEmpty() ) {
9695
final var configuration = options.getConfigurationValues();
97-
final JdbcContext jdbcContext = tool.resolveJdbcContext( configuration );
96+
final var jdbcContext = tool.resolveJdbcContext( configuration );
9897
doCreation(
9998
metadata,
10099
jdbcContext.getDialect(),
@@ -505,8 +504,9 @@ private static void createSchemasAndCatalogs(
505504
Formatter formatter,
506505
SqlStringGenerationContext context,
507506
GenerationTarget[] targets) {
508-
final boolean tryToCreateCatalogs = options.shouldManageNamespaces() && dialect.canCreateCatalog();
509-
final boolean tryToCreateSchemas = options.shouldManageNamespaces() && dialect.canCreateSchema();
507+
final boolean manageNamespaces = options.shouldManageNamespaces();
508+
final boolean tryToCreateCatalogs = manageNamespaces && dialect.canCreateCatalog();
509+
final boolean tryToCreateSchemas = manageNamespaces && dialect.canCreateSchema();
510510
// first, create each catalog/schema
511511
if ( tryToCreateCatalogs || tryToCreateSchemas ) {
512512
Set<Identifier> exportedCatalogs = new HashSet<>();
@@ -560,35 +560,35 @@ private static void checkExportIdentifier(Exportable exportable, Set<String> exp
560560
*
561561
* @return The generation commands
562562
*/
563+
@Internal
563564
public List<String> generateCreationCommands(Metadata metadata, final boolean manageNamespaces) {
564565
final var target = new JournalingGenerationTarget();
565-
566566
final var metadataImplementor = (MetadataImplementor) metadata;
567-
final var dialect =
567+
createFromMetadata(
568+
metadata,
569+
new ExecutionOptions() {
570+
@Override
571+
public boolean shouldManageNamespaces() {
572+
return manageNamespaces;
573+
}
574+
575+
@Override
576+
public Map<String,Object> getConfigurationValues() {
577+
return Collections.emptyMap();
578+
}
579+
580+
@Override
581+
public ExceptionHandler getExceptionHandler() {
582+
return ExceptionHandlerHaltImpl.INSTANCE;
583+
}
584+
},
568585
metadataImplementor.getMetadataBuildingOptions()
569586
.getServiceRegistry()
570587
.requireService( JdbcEnvironment.class )
571-
.getDialect();
572-
573-
final ExecutionOptions options = new ExecutionOptions() {
574-
@Override
575-
public boolean shouldManageNamespaces() {
576-
return manageNamespaces;
577-
}
578-
579-
@Override
580-
public Map<String,Object> getConfigurationValues() {
581-
return Collections.emptyMap();
582-
}
583-
584-
@Override
585-
public ExceptionHandler getExceptionHandler() {
586-
return ExceptionHandlerHaltImpl.INSTANCE;
587-
}
588-
};
589-
590-
createFromMetadata( metadata, options, dialect, FormatStyle.NONE.getFormatter(), target );
591-
588+
.getDialect(),
589+
FormatStyle.NONE.getFormatter(),
590+
target
591+
);
592592
return target.commands;
593593
}
594594

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void doDrop(
108108
TargetDescriptor targetDescriptor) {
109109
if ( !targetDescriptor.getTargetTypes().isEmpty() ) {
110110
final var configuration = options.getConfigurationValues();
111-
final JdbcContext jdbcContext = tool.resolveJdbcContext( configuration );
111+
final var jdbcContext = tool.resolveJdbcContext( configuration );
112112
doDrop(
113113
metadata,
114114
options,
@@ -417,14 +417,15 @@ private static void dropSchemasAndCatalogs(
417417
Formatter formatter,
418418
SqlStringGenerationContext context,
419419
GenerationTarget[] targets) {
420-
boolean tryToDropCatalogs = options.shouldManageNamespaces() && dialect.canCreateCatalog();
421-
boolean tryToDropSchemas = options.shouldManageNamespaces() && dialect.canCreateSchema();
420+
final boolean manageNamespaces = options.shouldManageNamespaces();
421+
final boolean tryToDropCatalogs = manageNamespaces && dialect.canCreateCatalog();
422+
final boolean tryToDropSchemas = manageNamespaces && dialect.canCreateSchema();
422423
if ( tryToDropCatalogs || tryToDropSchemas) {
423424
final Set<Identifier> exportedCatalogs = new HashSet<>();
424425
for ( var namespace : metadata.getDatabase().getNamespaces() ) {
425426
if ( schemaFilter.includeNamespace( namespace ) ) {
426-
Namespace.Name logicalName = namespace.getName();
427-
Namespace.Name physicalName = namespace.getPhysicalName();
427+
final var logicalName = namespace.getName();
428+
final var physicalName = namespace.getPhysicalName();
428429

429430
if ( tryToDropSchemas ) {
430431
final Identifier schemaPhysicalName = context.schemaWithDefault( physicalName.schema() );
@@ -434,7 +435,7 @@ private static void dropSchemasAndCatalogs(
434435
}
435436
}
436437

437-
if (tryToDropCatalogs) {
438+
if ( tryToDropCatalogs ) {
438439
final Identifier catalogLogicalName = logicalName.catalog();
439440
final Identifier catalogPhysicalName = context.catalogWithDefault( physicalName.catalog() );
440441
if ( catalogPhysicalName != null && !exportedCatalogs.contains( catalogLogicalName ) ) {
@@ -495,8 +496,8 @@ public DelayedDropAction buildDelayedAction(
495496
ExecutionOptions options,
496497
ContributableMatcher inclusionFilter,
497498
SourceDescriptor sourceDescriptor) {
498-
final JournalingGenerationTarget target = new JournalingGenerationTarget();
499-
final Dialect dialect = tool.getServiceRegistry().requireService( JdbcEnvironment.class ).getDialect();
499+
final var target = new JournalingGenerationTarget();
500+
final var dialect = tool.getServiceRegistry().requireService( JdbcEnvironment.class ).getDialect();
500501
doDrop( metadata, options, inclusionFilter, dialect, sourceDescriptor, target );
501502
return new DelayedDropActionImpl( target.commands, tool.getCustomDatabaseGenerationTarget() );
502503
}
@@ -520,18 +521,18 @@ public void doDrop(Metadata metadata, boolean manageNamespaces, GenerationTarget
520521
/**
521522
* For tests
522523
*/
524+
@Internal
523525
public void doDrop(
524526
Metadata metadata,
525527
final ServiceRegistry serviceRegistry,
526528
final Map<String,Object> settings,
527529
final boolean manageNamespaces,
528530
GenerationTarget... targets) {
529531
if ( targets == null || targets.length == 0 ) {
530-
final var jdbcContext = tool.resolveJdbcContext( settings );
531532
targets = new GenerationTarget[] {
532533
new GenerationTargetToDatabase(
533534
serviceRegistry.requireService( TransactionCoordinatorBuilder.class )
534-
.buildDdlTransactionIsolator( jdbcContext ),
535+
.buildDdlTransactionIsolator( tool.resolveJdbcContext( settings ) ),
535536
true
536537
)
537538
};
@@ -603,12 +604,10 @@ public DelayedDropActionImpl(ArrayList<String> commands, GenerationTarget target
603604
public void perform(ServiceRegistry serviceRegistry) {
604605
CORE_LOGGER.startingDelayedSchemaDrop();
605606

606-
final var jdbcContext = new JdbcContextDelayedDropImpl( serviceRegistry );
607-
608607
if ( target == null ) {
609608
target = new GenerationTargetToDatabase(
610609
serviceRegistry.requireService( TransactionCoordinatorBuilder.class )
611-
.buildDdlTransactionIsolator( jdbcContext ),
610+
.buildDdlTransactionIsolator( new JdbcContextDelayedDropImpl( serviceRegistry ) ),
612611
true
613612
);
614613
}

‎hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementToolCoordinator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public static void process(
7070
final ServiceRegistry serviceRegistry,
7171
final Map<String,Object> configuration,
7272
DelayedDropRegistry delayedDropRegistry) {
73-
final Set<ActionGrouping> groupings = ActionGrouping.interpret( metadata, configuration );
73+
final var groupings = ActionGrouping.interpret( metadata, configuration );
7474
if ( groupings.isEmpty() ) {
7575
// no actions specified
7676
LOG.debug( "No schema management actions found" );

0 commit comments

Comments
 (0)