This is an automated email from the git hooks/post-receive script. New change to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git from 11bdb67 ecran d'import au format generique new 30ace56 add failFast option in csvconsumer new 83babc1 add new line of temporary files (should fix this one...) new 1e67a06 introduce file result new bd1fccc -mmissing vessel linked new 92390da use failfats mode in normal temporary referential import new 7e02fa9 count file lines new acb35e6 add failfast option when loading files + show inmport configuration for report generation new 17510cb introduce result support + begin of validate report new 8605d60 continue validation The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8605d6019af9030ed3f9796478df56b9de6a82d2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 27 08:53:25 2015 +0100 continue validation commit 17510cb2cf232dce93138aeded2dba4a88702e11 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 25 19:54:10 2015 +0100 introduce result support + begin of validate report commit acb35e6b2e07387910eaf99c8ff7d5ebc9031d70 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 25 19:29:32 2015 +0100 add failfast option when loading files + show inmport configuration for report generation commit 7e02fa99ab963f66edf3d5bd457fa0317e56e5ef Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 25 19:26:46 2015 +0100 count file lines commit 92390daaf1915fad9955dfd67caf0ecab60b0891 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 25 19:26:11 2015 +0100 use failfats mode in normal temporary referential import commit bd1fcccf449696298e27adf0684a1cddc40e230f Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 25 19:25:41 2015 +0100 -mmissing vessel linked commit 1e67a06126dcb434f3fcaf3aae7b25bccfacc50c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 25 19:25:14 2015 +0100 introduce file result commit 83babc158cde80539db68f734728fe8c8f91b854 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 25 19:24:39 2015 +0100 add new line of temporary files (should fix this one...) commit 30ace567229e3736af9372fe2565a693b370bb0d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 25 19:23:32 2015 +0100 add failFast option in csvconsumer Summary of changes: .../fr/ifremer/tutti/service/csv/CsvComsumer.java | 61 ++- .../genericformat/GenericFormatArchive.java | 275 ++++++++------ ...GenericFormatArchiveInvalidLayoutException.java | 23 +- .../genericformat/GenericFormatFileResult.java | 74 ++++ .../genericformat/GenericFormatImportContext.java | 199 +++++++--- .../GenericFormatImportEntityParserFactory.java | 8 +- .../genericformat/GenericFormatImportRequest.java | 4 + .../genericformat/GenericFormatImportResult.java | 116 +----- .../genericformat/GenericFormatImportService.java | 327 +++++++++++----- .../GenericFormatReferentialImportResult.java | 36 +- .../genericformat/GenericFormatResultSupport.java | 217 +++++++++++ .../genericformat/GenericFormatServiceSupport.java | 2 +- .../GenericFormatValidateFileResult.java | 76 +--- .../consumer/CsvConsumerForAccidentalCatch.java | 4 +- .../consumer/CsvConsumerForCatch.java | 4 +- .../consumer/CsvConsumerForGearCaracteristic.java | 4 +- .../CsvConsumerForIndividualObservation.java | 4 +- .../consumer/CsvConsumerForMarineLitter.java | 4 +- .../consumer/CsvConsumerForOperation.java | 4 +- .../consumer/CsvConsumerForParameter.java | 4 +- .../consumer/CsvConsumerForSampleCategory.java | 4 +- .../consumer/CsvConsumerForSurvey.java | 4 +- .../referential/ReferentialImportRequest.java | 24 +- .../ReferentialTemporaryGearService.java | 2 +- .../ReferentialTemporaryPersonService.java | 2 +- .../ReferentialTemporarySpeciesService.java | 2 +- .../ReferentialTemporaryVesselService.java | 11 +- .../consumer/CsvConsumerForTemporaryGear.java | 80 ++-- .../consumer/CsvConsumerForTemporaryPerson.java | 80 ++-- .../consumer/CsvConsumerForTemporarySpecies.java | 80 ++-- .../consumer/CsvConsumerForTemporaryVessel.java | 81 ++-- .../resources/ftl/genericFormatImportReport_fr.ftl | 409 +++++++++++++++++++++ .../ftl/genericFormatValidateReport_fr.ftl | 335 ++++++++++++++++- .../GenericFormatImportServiceTest.java | 55 ++- .../GenericFormatImportServiceValidTest.java | 133 +++++++ .../sampleCategory.csv | 4 +- .../temporaryGears.csv | 4 +- .../temporaryGears.csv | 5 + .../genericFormat/default/accidentalCatch.csv | 2 +- .../default/individualObservation.csv | 2 +- .../genericFormat/default/marineLitter.csv | 2 +- .../resources/genericFormat/default/operation.csv | 2 +- .../resources/genericFormat/default/survey.csv | 2 +- .../genericFormat/empty/accidentalCatch.csv | 2 +- .../test/resources/genericFormat/empty/catch.csv | 2 +- .../genericFormat/empty/gearCaracteristics.csv | 2 +- .../genericFormat/empty/individualObservation.csv | 2 +- .../resources/genericFormat/empty/marineLitter.csv | 2 +- .../resources/genericFormat/empty/operation.csv | 2 +- .../resources/genericFormat/empty/parameter.csv | 2 +- .../test/resources/genericFormat/empty/survey.csv | 2 +- .../resources/genericFormat/onlyCruise/survey.csv | 2 +- .../{technical => referentials}/temporaryGears.csv | 2 +- .../temporaryPersons.csv | 0 .../temporarySpecies.csv | 0 .../temporaryVessels.csv | 0 .../sampleCategory.csv | 2 +- .../sampleCategory.csv | 4 +- 58 files changed, 2142 insertions(+), 655 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatFileResult.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatResultSupport.java create mode 100644 tutti-service/src/main/resources/ftl/genericFormatImportReport_fr.ftl create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceValidTest.java copy tutti-service/src/test/resources/genericFormat/{technical => badSampleCategoryFormat}/sampleCategory.csv (60%) copy tutti-service/src/test/resources/genericFormat/{technical => badTemporaryReferentialGearFormat}/temporaryGears.csv (61%) create mode 100644 tutti-service/src/test/resources/genericFormat/badTemporaryReferentialGearImport/temporaryGears.csv rename tutti-service/src/test/resources/genericFormat/{technical => referentials}/temporaryGears.csv (77%) rename tutti-service/src/test/resources/genericFormat/{technical => referentials}/temporaryPersons.csv (100%) rename tutti-service/src/test/resources/genericFormat/{technical => referentials}/temporarySpecies.csv (100%) rename tutti-service/src/test/resources/genericFormat/{technical => referentials}/temporaryVessels.csv (100%) copy tutti-service/src/test/resources/genericFormat/{technical => sampleCategory}/sampleCategory.csv (87%) rename tutti-service/src/test/resources/genericFormat/{technical => sampleCategoryFormatMismatch}/sampleCategory.csv (87%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.