Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migration: Pass migrations to Migrator in constructor #2974

Merged
merged 1 commit into from
Nov 5, 2024
Merged

migration: Pass migrations to Migrator in constructor #2974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion evolution/src/main/java/bisq/evolution/migration/MigrationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
import bisq.common.application.ApplicationVersion;
import bisq.common.application.Service;
import bisq.common.platform.Version;
import bisq.evolution.migration.migrations.Migration;
import bisq.evolution.migration.migrations.MigrationsForV2_1_2;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.concurrent.CompletableFuture;

public class MigrationService implements Service {
Expand All @@ -26,7 +29,8 @@ public CompletableFuture<Boolean> initialize() {
Version appVersion = ApplicationVersion.getVersion();

if (dataDirVersion.below(appVersion)) {
Migrator migrator = new Migrator(appVersion, dataDir);
List<Migration> allMigrations = List.of(new MigrationsForV2_1_2());
Migrator migrator = new Migrator(appVersion, dataDir, allMigrations);
migrator.migrate();
}

Expand Down
5 changes: 2 additions & 3 deletions evolution/src/main/java/bisq/evolution/migration/Migrator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import bisq.common.platform.Version;
import bisq.evolution.migration.migrations.Migration;
import bisq.evolution.migration.migrations.MigrationFailedException;
import bisq.evolution.migration.migrations.MigrationsForV2_1_2;
import lombok.extern.slf4j.Slf4j;

import java.io.IOException;
Expand All @@ -18,10 +17,10 @@ public class Migrator {
private final Path dataDir;
private final List<Migration> allMigrations;

public Migrator(Version appVersion, Path dataDir) {
public Migrator(Version appVersion, Path dataDir, List<Migration> allMigrations) {
this.appVersion = appVersion;
this.dataDir = dataDir;
this.allMigrations = List.of(new MigrationsForV2_1_2());
this.allMigrations = allMigrations;
}

public void migrate() {
Expand Down
3 changes: 2 additions & 1 deletion evolution/src/test/java/bisq/evolution/migration/MigratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;

import static org.assertj.core.api.Assertions.assertThat;

Expand All @@ -19,7 +20,7 @@ void migrationSuccess(@TempDir Path dataDir) throws IOException {
Files.writeString(versionFilePath, dataDirVersion.toString());

Version appVersion = ApplicationVersion.getVersion();
Migrator migrator = new Migrator(appVersion, dataDir);
Migrator migrator = new Migrator(appVersion, dataDir, Collections.emptyList());

migrator.migrate();

Expand Down
Loading