Skip to content

Commit fe7a055

Browse files
committed
variable renaming: dataSourceConfig -> dataSourceConfigFlyway
1 parent 1d8b104 commit fe7a055

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

backend/src/main/java/ch/puzzle/okr/multitenancy/FlywayMultitenantMigrationInitializer.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,20 @@ public FlywayMultitenantMigrationInitializer(TenantConfigProviderInterface tenan
2222

2323
public void migrateFlyway() {
2424
this.tenantConfigProvider.getTenantConfigs().forEach((tenantConfig) -> {
25-
TenantConfigProvider.DataSourceConfig dataSourceConfig = this.tenantConfigProvider
25+
TenantConfigProvider.DataSourceConfig dataSourceConfigFlyway = this.tenantConfigProvider
2626
.getTenantConfigById(tenantConfig.tenantId())
27-
.map(TenantConfigProvider.TenantConfig::dataSourceConfigFlyway).orElseThrow(
27+
.map(TenantConfigProvider.TenantConfig::dataSourceConfigFlyway) //
28+
.orElseThrow(
2829
() -> new EntityNotFoundException("Cannot find tenant for configuring flyway migration"));
2930

30-
logUsedHibernateConfig(dataSourceConfig);
31+
logUsedHibernateConfig(dataSourceConfigFlyway);
3132

3233
Flyway tenantSchemaFlyway = Flyway.configure() //
33-
.dataSource(dataSourceConfig.url(), dataSourceConfig.name(), dataSourceConfig.password()) //
34+
.dataSource(dataSourceConfigFlyway.url(), dataSourceConfigFlyway.name(),
35+
dataSourceConfigFlyway.password()) //
3436
.locations(scriptLocations) //
3537
.baselineOnMigrate(Boolean.TRUE) //
36-
.schemas(dataSourceConfig.schema()) //
38+
.schemas(dataSourceConfigFlyway.schema()) //
3739
.load();
3840

3941
tenantSchemaFlyway.migrate();

0 commit comments

Comments
 (0)