This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 428ea83a7f8e183749d74380ee389c633d7e03ff Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 26 14:18:03 2015 +0200 Masquer une erreur technique lors de la création d'un répertoire temporaire --- .../observe/services/ObserveServiceApplicationContext.java | 9 +++++++-- .../fr/ird/observe/services/service/DataSourceService.java | 4 +--- .../fr/ird/observe/services/ObserveServiceContextTopia.java | 4 ++-- .../ird/observe/services/service/DataSourceServiceTopia.java | 11 ++++++++--- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceApplicationContext.java b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceApplicationContext.java index 49a84ee..5e80a74 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceApplicationContext.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceApplicationContext.java @@ -53,9 +53,14 @@ public class ObserveServiceApplicationContext { this.temporaryDirectoryRoot = temporaryDirectoryRoot; } - public File createTemporaryDirectory(String prefix) throws IOException { + public File createTemporaryDirectory(String prefix) { Set<PosixFilePermission> posixFilePermissions = PosixFilePermissions.fromString("rwxr-x---"); FileAttribute<Set<PosixFilePermission>> fileAttribute = PosixFilePermissions.asFileAttribute(posixFilePermissions); - return Files.createTempDirectory(temporaryDirectoryRoot, prefix, fileAttribute).toFile(); + try { + return Files.createTempDirectory(temporaryDirectoryRoot, prefix, fileAttribute).toFile(); + } catch (IOException e) { + //TODO Avoir une exception plus concrete + throw new RuntimeException("Could not create temporary directory with preifx: "+prefix,e); + } } } 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 f93dce1..319d81e 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 @@ -6,8 +6,6 @@ import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportExcept import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.spi.NoDataAccess; -import java.io.IOException; - /** * Created on 21/08/15. * @@ -22,7 +20,7 @@ public interface DataSourceService extends ObserveService { boolean canConnect(); @NoDataAccess - void create(DataSourceCreateConfigurationDto dataSourceCreateConfiguration) throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException; + void create(DataSourceCreateConfigurationDto dataSourceCreateConfiguration) throws IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException; @NoDataAccess void open() throws DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java index 5bec7f8..c846e89 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java @@ -7,7 +7,6 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopia import fr.ird.observe.services.dto.constants.ReferentialLocale; import java.io.File; -import java.io.IOException; import java.util.Date; /** @@ -52,7 +51,7 @@ public class ObserveServiceContextTopia implements ObserveServiceContext { } @Override - public File createTemporaryDirectory(String prefix) throws IOException { + public File createTemporaryDirectory(String prefix) { return applicationContext.createTemporaryDirectory(prefix); } @@ -88,4 +87,5 @@ public class ObserveServiceContextTopia implements ObserveServiceContext { topiaPersistenceContext.close(); topiaPersistenceContext = null; } + } 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 25a94d5..52ea0f3 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 @@ -34,7 +34,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS } @Override - public void create(DataSourceCreateConfigurationDto dataSourceCreateConfiguration) throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { + public void create(DataSourceCreateConfigurationDto dataSourceCreateConfiguration) throws IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { dataSourceCreateConfiguration.validateConfiguration(); @@ -143,10 +143,15 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS } - protected void executeGzipSqlStatements(ObserveTopiaApplicationContext topiaApplicationContext, String temporaryFilePrefix, byte... content) throws IOException { + protected void executeGzipSqlStatements(ObserveTopiaApplicationContext topiaApplicationContext, String temporaryFilePrefix, byte... content) { File temporaryDirectory = serviceContext.createTemporaryDirectory(temporaryFilePrefix); - topiaApplicationContext.executeGzipSqlStatements(temporaryDirectory, content); + try { + topiaApplicationContext.executeGzipSqlStatements(temporaryDirectory, content); + } catch (IOException e) { + //TODO Avoir une exception concrete + throw new RuntimeException("Could not execute GZipSqlStatements", e); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.