diff --git a/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtension.java b/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtension.java index 714745b..24f4dfe 100644 --- a/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtension.java +++ b/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtension.java @@ -103,9 +103,6 @@ public class LoggingHouseClientExtension implements ServiceExtension { @Setting private static final String EDC_DATASOURCE_REPAIR_SETTING = "edc.flyway.repair"; - @Setting - private static final String FLYWAY_CLEAN_ENABLED = "edc.flyway.clean.enable"; - @Setting private static final String FLYWAY_CLEAN = "edc.flyway.clean"; @@ -163,7 +160,6 @@ private void runFlywayMigrations(ServiceExtensionContext context) { var flywayService = new FlywayService( context.getMonitor(), context.getSetting(EDC_DATASOURCE_REPAIR_SETTING, false), - context.getSetting(FLYWAY_CLEAN_ENABLED, false), context.getSetting(FLYWAY_CLEAN, false) ); var migrationManager = new DatabaseMigrationManager(context.getConfig(), context.getMonitor(), flywayService); diff --git a/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/flyway/FlywayService.java b/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/flyway/FlywayService.java index 177554d..4863dd9 100644 --- a/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/flyway/FlywayService.java +++ b/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/flyway/FlywayService.java @@ -35,13 +35,11 @@ public class FlywayService { private final Monitor monitor; private final boolean tryRepairOnFailedMigration; - private final boolean cleanEnabled; private final boolean clean; - public FlywayService(Monitor monitor, boolean tryRepairOnFailedMigration, boolean cleanEnabled, boolean clean) { + public FlywayService(Monitor monitor, boolean tryRepairOnFailedMigration, boolean clean) { this.monitor = monitor; this.tryRepairOnFailedMigration = tryRepairOnFailedMigration; - this.cleanEnabled = cleanEnabled; this.clean = clean; } @@ -104,7 +102,7 @@ private Flyway setupFlyway(DatasourceProperties datasourceProperties) { .dataSource(dataSource) .table(MIGRATION_TABLE_NAME) .locations(migrationLocations.toArray(new String[0])) - .cleanDisabled(!cleanEnabled) + .cleanDisabled(!clean) .load(); }