diff options
author | Matteo Mara <matteo.mara@sonarsource.com> | 2024-05-02 17:51:27 +0200 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2024-05-08 20:02:44 +0000 |
commit | c66dbade2186e6b8b8e3de1d0bf3ad4e95c6e093 (patch) | |
tree | 580c3590d9b7a7130d804f3dc0aed4f086870410 /server/sonar-webserver-core/src/main/java | |
parent | 11dbe7d367ed9ead2224e451b050ab7e468ea952 (diff) | |
download | sonarqube-c66dbade2186e6b8b8e3de1d0bf3ad4e95c6e093.tar.gz sonarqube-c66dbade2186e6b8b8e3de1d0bf3ad4e95c6e093.zip |
SONAR-22141 add new fields in the response of migrations-status endpoint
Diffstat (limited to 'server/sonar-webserver-core/src/main/java')
2 files changed, 5 insertions, 3 deletions
diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/AutoDbMigration.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/AutoDbMigration.java index e6b10d6dc44..c6b2bef3da8 100644 --- a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/AutoDbMigration.java +++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/AutoDbMigration.java @@ -23,6 +23,7 @@ import org.sonar.api.Startable; import org.slf4j.LoggerFactory; import org.sonar.server.platform.DefaultServerUpgradeStatus; import org.sonar.server.platform.db.migration.engine.MigrationEngine; +import org.sonar.server.platform.db.migration.step.NoOpMigrationStatusListener; public class AutoDbMigration implements Startable { private final DefaultServerUpgradeStatus serverUpgradeStatus; @@ -37,10 +38,10 @@ public class AutoDbMigration implements Startable { public void start() { if (serverUpgradeStatus.isFreshInstall()) { LoggerFactory.getLogger(getClass()).info("Automatically perform DB migration on fresh install"); - migrationEngine.execute(); + migrationEngine.execute(new NoOpMigrationStatusListener()); } else if (serverUpgradeStatus.isUpgraded() && serverUpgradeStatus.isAutoDbUpgrade()) { LoggerFactory.getLogger(getClass()).info("Automatically perform DB migration, as automatic database upgrade is enabled"); - migrationEngine.execute(); + migrationEngine.execute(new NoOpMigrationStatusListener()); } } diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationImpl.java index f116466532e..9ddd8346604 100644 --- a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationImpl.java +++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationImpl.java @@ -27,6 +27,7 @@ import org.sonar.core.util.logs.Profiler; import org.sonar.server.platform.Platform; import org.sonar.server.platform.db.migration.DatabaseMigrationState.Status; import org.sonar.server.platform.db.migration.engine.MigrationEngine; +import org.sonar.server.platform.db.migration.step.MigrationStatusListenerImpl; import org.sonar.server.platform.db.migration.step.MigrationStepExecutionException; /** @@ -102,7 +103,7 @@ public class DatabaseMigrationImpl implements DatabaseMigration { private void doUpgradeDb() { Profiler profiler = Profiler.createIfTrace(LOGGER); profiler.startTrace("Starting DB Migration"); - migrationEngine.execute(); + migrationEngine.execute(new MigrationStatusListenerImpl(migrationState)); profiler.stopTrace("DB Migration ended"); } |