This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 0896dd7e73ceaab18a32924bbe995f719a7d4956 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu May 12 09:09:06 2016 +0200 Catch more exception while importing + ajout meilleur TODO --- .../service/importdata/actions/ImportDataActionSupport.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java index 8811fdd..f031028 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java @@ -25,7 +25,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.csv.ExportModel; import org.nuiton.csv.Import; import org.nuiton.csv.ImportModel; -import org.nuiton.csv.ImportRuntimeException; import org.nuiton.topia.persistence.TopiaEntity; import java.io.BufferedWriter; @@ -172,7 +171,7 @@ public abstract class ImportDataActionSupport<M extends ImportDataConfigurationS try { performImport(importDataContext, inputFile, result); - } catch (ImportRuntimeException e) { + } catch (Exception e) { throw new ImportException(importDataContext.getLocale(), inputFile, e); } finally { flushProcessedExport(result); @@ -314,11 +313,12 @@ public abstract class ImportDataActionSupport<M extends ImportDataConfigurationS } protected void checkImport(ImportDataFileResult result, InputFile processedExportFile, InputFile importedExportFile) { - //TODO checkt that processed and imported file are the same if (log.isInfoEnabled()) { log.info("Check processed export file: " + processedExportFile + " vs imported export file: " + importedExportFile); } try { + + //TODO Faire cela de manière moins brute : comparaison des fichiers ligne à ligne (n plus cela nous donnerait aussi le numéro de première ligne défaillante) File dataDirectory = persistenceService.getConfiguration().getDataDirectory(); String expectedContent = new String(Files.readAllBytes(processedExportFile.getFile().toPath()), StandardCharsets.UTF_8); String actualContent = new String(Files.readAllBytes(importedExportFile.getFile().toPath()), StandardCharsets.UTF_8); @@ -410,7 +410,7 @@ public abstract class ImportDataActionSupport<M extends ImportDataConfigurationS } - public <E extends TopiaEntity> void addId(ImportDataFileResult importResult, EchoBaseUserEntityEnum entityEnum, E entity, int lineNumber) { + public <EE extends TopiaEntity> void addId(ImportDataFileResult importResult, EchoBaseUserEntityEnum entityEnum, EE entity, int lineNumber) { int entityCount = importResult.addId(entityEnum); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.