ApplicationService: Apply migrations before starting services

alvasw · Oct 20, 2024 · ff2dca8 · ff2dca8
1 parent c216cca
commit ff2dca8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/application/src/main/java/bisq/application/ApplicationService.java b/application/src/main/java/bisq/application/ApplicationService.java
@@ -17,6 +17,7 @@
 
 package bisq.application;
 
+import bisq.application.migration.MigrationService;
 import bisq.common.application.ApplicationVersion;
 import bisq.common.application.DevMode;
 import bisq.common.application.OptionUtils;
@@ -124,6 +125,7 @@ public Config(Path baseDir,
     protected final Config config;
     @Getter
     protected final PersistenceService persistenceService;
+    private final MigrationService migrationService;
     @SuppressWarnings("FieldCanBeLocal") // Pin it so that it does not get GC'ed
     private final MemoryReport memoryReport;
     private FileLock instanceLock;
@@ -185,6 +187,7 @@ public ApplicationService(String configFileName, String[] args) {
 
         String absoluteDataDirPath = dataDir.toAbsolutePath().toString();
         persistenceService = new PersistenceService(absoluteDataDirPath);
+        migrationService = new MigrationService(dataDir);
     }
 
     private void checkInstanceLock() {
@@ -207,7 +210,9 @@ public CompletableFuture<Boolean> readAllPersisted() {
         return persistenceService.readAllPersisted();
     }
 
-    public abstract CompletableFuture<Boolean> initialize();
+    public CompletableFuture<Boolean> initialize() {
+        return migrationService.runMigrations();
+    }
 
     public abstract CompletableFuture<Boolean> shutdown();
 

diff --git a/apps/desktop/desktop-app/src/main/java/bisq/desktop_app/DesktopApplicationService.java b/apps/desktop/desktop-app/src/main/java/bisq/desktop_app/DesktopApplicationService.java
@@ -219,7 +219,8 @@ public DesktopApplicationService(String[] args, ShutDownHandler shutDownHandler)
 
     @Override
     public CompletableFuture<Boolean> initialize() {
-        return securityService.initialize()
+        return super.initialize()
+                .thenCompose(result -> securityService.initialize())
                 .thenCompose(result -> {
                     setState(State.INITIALIZE_NETWORK);
 

diff --git a/apps/oracle-node-app/src/main/java/bisq/oracle_node/OracleNodeApplicationService.java b/apps/oracle-node-app/src/main/java/bisq/oracle_node/OracleNodeApplicationService.java
@@ -80,7 +80,8 @@ public OracleNodeApplicationService(String[] args) {
 
     @Override
     public CompletableFuture<Boolean> initialize() {
-        return securityService.initialize()
+        return super.initialize()
+                .thenCompose(result -> securityService.initialize())
                 .thenCompose(result -> networkService.initialize())
                 .thenCompose(result -> identityService.initialize())
                 .thenCompose(result -> bondedRolesService.initialize())

diff --git a/apps/rest-api-app/src/main/java/bisq/rest_api/RestApiApplicationService.java b/apps/rest-api-app/src/main/java/bisq/rest_api/RestApiApplicationService.java
@@ -167,7 +167,8 @@ public RestApiApplicationService(String[] args) {
 
     @Override
     public CompletableFuture<Boolean> initialize() {
-        return securityService.initialize()
+        return super.initialize()
+                .thenCompose(result -> securityService.initialize())
                 .thenCompose(result -> {
                     setState(State.INITIALIZE_NETWORK);
 

diff --git a/apps/seed-node-app/src/main/java/bisq/seed_node/SeedNodeApplicationService.java b/apps/seed-node-app/src/main/java/bisq/seed_node/SeedNodeApplicationService.java
@@ -75,7 +75,8 @@ public SeedNodeApplicationService(String[] args) {
 
     @Override
     public CompletableFuture<Boolean> initialize() {
-        return securityService.initialize()
+        return super.initialize()
+                .thenCompose(result -> securityService.initialize())
                 .thenCompose(result -> networkService.initialize())
                 .thenCompose(result -> identityService.initialize())
                 .thenCompose(result -> bondedRolesService.initialize())