Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cba03f18 by Tony Chemit at 2020-12-14T16:28:07+01:00 Fix backup usage - - - - - 87feceb6 by Tony Chemit at 2020-12-15T09:49:31+01:00 add fixme - - - - - 3 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java - client/core/src/main/java/fr/ird/observe/dto/decoration/WithDecoratorService.java Changes: ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -179,7 +179,9 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig private File feedBackDirectoryFile; public static ClientConfig forTest() { - return new ClientConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.ENV, ApplicationConfigScope.SYSTEM), DEFAULT_OBSERVE_SWING_CONFIGURATION_FILENAME); + ClientConfig clientConfig = new ClientConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.ENV, ApplicationConfigScope.SYSTEM), DEFAULT_OBSERVE_SWING_CONFIGURATION_FILENAME); + clientConfig.setBackupUse(false); + return clientConfig; } public static void initI18n(ClientConfig config) { ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java ===================================== @@ -126,7 +126,7 @@ public class BackupsManager implements Closeable { try { List<BackupStorage> backups; - if (Files.exists(storePath)) { + if (config.isBackupUse() && Files.exists(storePath)) { try (BufferedReader reader = Files.newBufferedReader(storePath, StandardCharsets.UTF_8)) { Type typeOfT = new TypeToken<List<BackupStorage>>() { }.getType(); ===================================== client/core/src/main/java/fr/ird/observe/dto/decoration/WithDecoratorService.java ===================================== @@ -24,6 +24,9 @@ package fr.ird.observe.dto.decoration; import fr.ird.observe.client.ClientUIContextApplicationComponent; +/** + * FIXME Remove this, decoration should not be exposed but internal + */ public interface WithDecoratorService { default DecoratorService getDecoratorService() { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d8dca290f8a6cb54ffbbfb3a8... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d8dca290f8a6cb54ffbbfb3a8... You're receiving this email because of your account on gitlab.com.