This is an automated email from the git hooks/post-receive script. New commit to branch feature/8124-VerifConfigurationSource in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 7b833be90de5daafcc2a9f17013ebe797a2eac18 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 15 17:46:57 2016 +0100 dans le service de generation des Dump de base de donnée, n'exposer qu'une methode générique (see #8124). --- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 4 +- .../observe/ui/admin/save/SaveLocalUIHandler.java | 3 +- .../ird/observe/ui/storage/StorageUIHandler.java | 6 ++- .../fr/ird/observe/ui/storage/StorageUIModel.java | 5 +- .../services/service/SqlScriptProducerService.java | 13 ----- .../services/service/DataSourceServiceTopia.java | 9 ++-- .../service/SqlScriptProducerServiceTopia.java | 61 ---------------------- .../services/service/MigrateTestsDatabases.java | 15 ++++-- 8 files changed, 29 insertions(+), 87 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java index 9c2a7fa..324c508 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java @@ -30,6 +30,7 @@ import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.services.service.SqlScriptProducerRequest; import fr.ird.observe.services.service.SqlScriptProducerService; import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.admin.config.SelectDataUI; @@ -129,7 +130,8 @@ public class AdminTabUIHandler { // on replique les données specifiees ImmutableSet<String> dataIds = ImmutableSet.<String>copyOf(tripIds); - byte[] dataDump = sqlScriptProducerService.getDataDump(dataIds); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addDataIds(dataIds); + byte[] dataDump = sqlScriptProducerService.produceSqlScript(request); source.close(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java index 6bef01e..18219c1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java @@ -162,7 +162,8 @@ public class SaveLocalUIHandler extends AdminTabUIHandler { File backupFile = stepModel.getBackupFile(); SqlScriptProducerService dumpService = source.newSqlScriptProducerService(); - byte[] dump = dumpService.getAllDataDump(); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addAllData(); + byte[] dump = dumpService.produceSqlScript(request); try (FileOutputStream outputStream = new FileOutputStream(backupFile)) { IOUtils.write(dump, outputStream); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index 4856d7a..69808fd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -612,7 +612,8 @@ public class StorageUIHandler { log.debug(dst); } - byte[] dataDump = dumpProducerService.getAllDataDump(); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addAllData(); + byte[] dataDump = dumpProducerService.produceSqlScript(request); try (FileOutputStream outputStream = new FileOutputStream(dst)) { @@ -667,7 +668,8 @@ public class StorageUIHandler { ImmutableSet<String> tripIds = ImmutableSet.copyOf(Iterables.transform(trips, DataReference.getIdFunction())); - byte[] dump = dumpService.getDataDump(tripIds); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addDataIds(tripIds); + byte[] dump = dumpService.produceSqlScript(request); try (FileOutputStream fileOutputStream = new FileOutputStream(dst)) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index 51189bc..db85de9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -48,6 +48,7 @@ import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.PingService; +import fr.ird.observe.services.service.SqlScriptProducerRequest; import fr.ird.observe.services.service.SqlScriptProducerService; import fr.ird.observe.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.ui.storage.tabs.SecurityModel; @@ -1591,7 +1592,9 @@ public class StorageUIModel extends WizardModel<StorageStep> { SqlScriptProducerService dumpService = source.newService(SqlScriptProducerService.class); - byte[] dump = dumpService.getReferentialDump(); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential(); + byte[] dump = dumpService.produceSqlScript(request); + result.setImportDatabase(dump); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java index c370a36..2925ad5 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java @@ -1,6 +1,5 @@ package fr.ird.observe.services.service; -import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.ObserveService; /** @@ -10,17 +9,5 @@ import fr.ird.observe.services.ObserveService; */ public interface SqlScriptProducerService extends ObserveService { - byte[] getH2Schema(); - - byte[] getPostgresSchema(); - - byte[] getReferentialDump(); - - byte[] getDataDump(ImmutableSet<String> dataIds); - - byte[] getAllDataDump(); - - byte[] getDump(); - byte[] produceSqlScript(SqlScriptProducerRequest request); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java index 9f91b5d..676d7ad 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java @@ -207,7 +207,8 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS ObserveDataSourceConfiguration importDataSourceConfiguration = dataSourceCreateConfiguration.getImportReferentialDataSourceConfiguration(); SqlScriptProducerService dumpProducerService = serviceContext.newService(importDataSourceConfiguration, SqlScriptProducerService.class); - byte[] referentialDump = dumpProducerService.getReferentialDump(); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addReferential(); + byte[] referentialDump = dumpProducerService.produceSqlScript(request); topiaApplicationContext.executeSqlStatements(referentialDump); referantialImported = true; @@ -227,7 +228,8 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS } // Réplication du référentiel - byte[] referentialDump = dumpProducerService.getReferentialDump(); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addReferential(); + byte[] referentialDump = dumpProducerService.produceSqlScript(request); if (log.isInfoEnabled()) { log.info("Import referential."); @@ -243,7 +245,8 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS log.info("Get data: " + importDataIds); } - byte[] dataDump = dumpProducerService.getDataDump(importDataIds); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addDataIds(importDataIds); + byte[] dataDump = dumpProducerService.produceSqlScript(request); if (log.isInfoEnabled()) { log.info("Import data."); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java index 73ebe38..30b7896 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java @@ -1,6 +1,5 @@ package fr.ird.observe.services.service; -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; @@ -54,66 +53,6 @@ public class SqlScriptProducerServiceTopia extends ObserveServiceTopia implement } - @Override - public byte[] getH2Schema() { - if (log.isTraceEnabled()) { - log.trace("getH2Schema()"); - } - - SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema(); - return produceSqlScript(request); - } - - @Override - public byte[] getPostgresSchema() { - if (log.isTraceEnabled()) { - log.trace("getPostgresSchema()"); - } - - SqlScriptProducerRequest request = SqlScriptProducerRequest.forPostgres().addSchema(); - return produceSqlScript(request); - } - - @Override - public byte[] getReferentialDump() { - if (log.isTraceEnabled()) { - log.trace("getReferentialDump()"); - } - - SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addReferential(); - return produceSqlScript(request); - } - - @Override - public byte[] getDataDump(ImmutableSet<String> dataIds) { - if (log.isTraceEnabled()) { - log.trace("getDataDump([" + Joiner.on(", ").join(dataIds) + "])"); - } - - SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addDataIds(dataIds); - return produceSqlScript(request); - } - - @Override - public byte[] getAllDataDump() { - if (log.isTraceEnabled()) { - log.trace("getAllDataDump()"); - } - - SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addAllData(); - return produceSqlScript(request); - } - - @Override - public byte[] getDump() { - if (log.isTraceEnabled()) { - log.trace("getDump()"); - } - - SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); - return produceSqlScript(request); - } - protected SqlRequests sqlRequests(SqlScriptProducerRequest request, SqlRequests.Builder builder) { if (request.isAddSchema()) { diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java index fdebd1a..7bbf6f4 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java @@ -41,31 +41,36 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { @DatabaseNameConfiguration(DatabaseName.referentiel) @Test public void migrateReferentielDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - migrate(service.getDump()); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); + migrate(service.produceSqlScript(request)); } @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @Test public void migrateDataForTestSeineDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - migrate(service.getDump()); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); + migrate(service.produceSqlScript(request)); } @DatabaseNameConfiguration(DatabaseName.dataForTestLongline) @Test public void migrateDataForTestLonglineDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - migrate(service.getDump()); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); + migrate(service.produceSqlScript(request)); } @DatabaseNameConfiguration(DatabaseName.empty_h2) @Test public void migrateEmptyH2Db() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - migrate(service.getH2Schema()); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema(); + migrate(service.produceSqlScript(request)); } @DatabaseNameConfiguration(DatabaseName.empty_h2) @Test public void migrateEmptyPgDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - migrate(DatabaseName.empty_pg.name(), service.getPostgresSchema()); + SqlScriptProducerRequest request = SqlScriptProducerRequest.forPostgres().addSchema(); + migrate(DatabaseName.empty_pg.name(), service.produceSqlScript(request)); } protected void migrate(byte[] dump) throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.