This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 1f07a4c195abc5e6b20cec85163eb12d3367b3f5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jan 9 09:13:03 2016 +0100 Rendre Closeable DataSourceService et bien fermer la base commune après sa création (cela était fait avant en utilisant la commande restore de H2) --- .../ird/observe/services/service/DataSourceService.java | 4 +++- .../ird/observe/services/ApplicationContextResource.java | 15 ++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java index acfa481..0e1b2e9 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java @@ -36,6 +36,7 @@ import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; +import java.io.Closeable; import java.util.Set; /** @@ -43,7 +44,7 @@ import java.util.Set; * * @author Tony Chemit - chemit@codelutin.com */ -public interface DataSourceService extends ObserveService { +public interface DataSourceService extends ObserveService, Closeable { @NoDataAccess ObserveDataSourceInformation checkCanConnect(ObserveDataSourceConfiguration dataSourceConfiguration) throws DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException; @@ -63,6 +64,7 @@ public interface DataSourceService extends ObserveService { @NoDataAccess void migrateData(ObserveDataSourceConfiguration dataSourceConfiguration); + @Override void close(); void destroy(); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java index c4657f4..95c6480 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java @@ -32,7 +32,6 @@ import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportExcept import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.service.DataSourceService; -import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.TestHelper; import fr.ird.observe.test.spi.DatabaseNameConfiguration; @@ -99,7 +98,6 @@ public class ApplicationContextResource implements TestRule { ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration; - boolean createEmptydatabase = DatabaseName.empty.name().equals(dbName); boolean sharedDatabaseExist = sharedDatabaseFile.exists(); if (!sharedDatabaseExist) { @@ -107,19 +105,14 @@ public class ApplicationContextResource implements TestRule { log.info("Create shared database: " + dbVersion.toString() + "/" + dbName + " to " + sharedDatabaseFile); } - DataSourceService dataSourceService = newService(sharedDatabaseConfiguration, DataSourceService.class); - DataSourceCreateConfigurationDto createConfiguration = new DataSourceCreateConfigurationDto(); - -// if (!createEmptydatabase) { + try (DataSourceService dataSourceService = newService(sharedDatabaseConfiguration, DataSourceService.class)) { + DataSourceCreateConfigurationDto createConfiguration = new DataSourceCreateConfigurationDto(); byte[] databaseToImportContent = dataSourcesForTestManager.getDatabaseScriptContent(dbVersion, dbName); createConfiguration.setImportDatabase(databaseToImportContent); -// } else { -// createConfiguration.setCanCreateEmptyDatabase(true); -// -// } - dataSourceService.create(sharedDatabaseConfiguration, createConfiguration); + dataSourceService.create(sharedDatabaseConfiguration, createConfiguration); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.