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 44d8d3213f4314e384a883fb5b206f635ff7e866 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 5 12:29:46 2015 +0100 Ajout d'une méthode pour obtenir directement la liste des référentiels temporaires (aussi utilisé pour l'export générique) --- .../ReferentialTemporaryGearService.java | 64 +++++++++++---------- .../ReferentialTemporaryPersonService.java | 63 ++++++++++++--------- .../ReferentialTemporarySpeciesService.java | 66 ++++++++++++---------- .../ReferentialTemporaryVesselService.java | 65 +++++++++++---------- 4 files changed, 141 insertions(+), 117 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java index 97a7420..9985612 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java @@ -121,10 +121,15 @@ public class ReferentialTemporaryGearService extends AbstractTuttiService { public void exportExistingTemporaryGear(File file) throws IOException { + List<Gear> toExport = getTemporaryGears(); + exportTemporaryGear(file, toExport); + + } + + public List<Gear> getTemporaryGears() { if (log.isInfoEnabled()) { log.info("Getting all gears from database"); } - List<Gear> targetList = Lists.newArrayList(persistenceService.getAllFishingGear()); targetList.addAll(persistenceService.getAllScientificGear()); if (log.isInfoEnabled()) { @@ -134,8 +139,7 @@ public class ReferentialTemporaryGearService extends AbstractTuttiService { if (log.isInfoEnabled()) { log.info("Got " + toExport.size() + " temporary gears"); } - exportTemporaryGear(file, toExport); - + return toExport; } public void exportTemporaryGearExample(File file) throws IOException { @@ -172,6 +176,32 @@ public class ReferentialTemporaryGearService extends AbstractTuttiService { } + public void exportTemporaryGear(File file, List<Gear> toExport) throws IOException { + + GearModel csvModel = new GearModel(getCsvSeparator()); + + BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); + + List<GearRow> toExportRows = Lists.transform(toExport, new Function<Gear, GearRow>() { + @Override + public GearRow apply(Gear gear) { + return new GearRow(gear); + } + }); + + try { + Export export = Export.newExport(csvModel, toExportRows); + export.write(writer); + writer.close(); + } catch (IOException e) { + throw e; + } catch (Exception e) { + throw new ApplicationTechnicalException(t("tutti.service.referential.export.gear.error", file), e); + } finally { + IOUtils.closeQuietly(writer); + } + } + protected ImportRequestResult<Gear, Integer> processImportFile(File file, List<Gear> existingEntities) { ImportRequestResult<Gear, Integer> requestResult = new ImportRequestResult<>(existingEntities, TuttiEntities.<Gear>newIdAstIntFunction(), Gears.GET_NAME); @@ -273,33 +303,7 @@ public class ReferentialTemporaryGearService extends AbstractTuttiService { } - protected void exportTemporaryGear(File file, List<Gear> toExport) throws IOException { - - GearModel csvModel = new GearModel(getCsvSeparator()); - - BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); - - List<GearRow> toExportRows = Lists.transform(toExport, new Function<Gear, GearRow>() { - @Override - public GearRow apply(Gear gear) { - return new GearRow(gear); - } - }); - - try { - Export export = Export.newExport(csvModel, toExportRows); - export.write(writer); - writer.close(); - } catch (IOException e) { - throw e; - } catch (Exception e) { - throw new ApplicationTechnicalException(t("tutti.service.referential.export.gear.error", file), e); - } finally { - IOUtils.closeQuietly(writer); - } - } - protected char getCsvSeparator() { - return context.getConfig().getCsvSeparator(); + return ';'; } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java index 9a9f6b9..ddea706 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java @@ -117,7 +117,7 @@ public class ReferentialTemporaryPersonService extends AbstractTuttiService { return result; } - public void exportExistingTemporaryPerson(File file) throws IOException { + public List<Person> getTemporaryPersons() { if (log.isInfoEnabled()) { log.info("Getting all persons from database"); @@ -130,6 +130,13 @@ public class ReferentialTemporaryPersonService extends AbstractTuttiService { if (log.isInfoEnabled()) { log.info("Got " + toExport.size() + " temporary persons"); } + return toExport; + + } + + public void exportExistingTemporaryPerson(File file) throws IOException { + + List<Person> toExport = getTemporaryPersons(); exportTemporaryPerson(file, toExport); } @@ -159,6 +166,32 @@ public class ReferentialTemporaryPersonService extends AbstractTuttiService { } + public void exportTemporaryPerson(File file, List<Person> toExport) throws IOException { + + PersonModel csvModel = new PersonModel(getCsvSeparator()); + + BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); + + List<PersonRow> toExportRows = Lists.transform(toExport, new Function<Person, PersonRow>() { + @Override + public PersonRow apply(Person person) { + return new PersonRow(person); + } + }); + + try { + Export export = Export.newExport(csvModel, toExportRows); + export.write(writer); + writer.close(); + } catch (IOException e) { + throw e; + } catch (Exception e) { + throw new ApplicationTechnicalException(t("tutti.service.referential.export.person.error", file), e); + } finally { + IOUtils.closeQuietly(writer); + } + } + protected ImportRequestResult<Person, Integer> processImportFile(File file, List<Person> existingEntities) { ImportRequestResult<Person, Integer> requestResult = new ImportRequestResult<>(existingEntities, TuttiEntities.<Person>newIdAstIntFunction(), Persons.GET_FULL_NAME); @@ -260,33 +293,7 @@ public class ReferentialTemporaryPersonService extends AbstractTuttiService { } - protected void exportTemporaryPerson(File file, List<Person> toExport) throws IOException { - - PersonModel csvModel = new PersonModel(getCsvSeparator()); - - BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); - - List<PersonRow> toExportRows = Lists.transform(toExport, new Function<Person, PersonRow>() { - @Override - public PersonRow apply(Person person) { - return new PersonRow(person); - } - }); - - try { - Export export = Export.newExport(csvModel, toExportRows); - export.write(writer); - writer.close(); - } catch (IOException e) { - throw e; - } catch (Exception e) { - throw new ApplicationTechnicalException(t("tutti.service.referential.export.person.error", file), e); - } finally { - IOUtils.closeQuietly(writer); - } - } - protected char getCsvSeparator() { - return context.getConfig().getCsvSeparator(); + return ';'; } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java index 164848d..fdffb63 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java @@ -115,7 +115,7 @@ public class ReferentialTemporarySpeciesService extends AbstractTuttiService { return result; } - public void exportExistingTemporarySpecies(File file) throws IOException { + public List<Species> getTemporarySpeciess() { if (log.isInfoEnabled()) { log.info("Getting all species from database"); @@ -129,6 +129,13 @@ public class ReferentialTemporarySpeciesService extends AbstractTuttiService { if (log.isInfoEnabled()) { log.info("Got " + toExport.size() + " temporary species"); } + return toExport; + + } + + public void exportExistingTemporarySpecies(File file) throws IOException { + + List<Species> toExport = getTemporarySpeciess(); exportTemporarySpecies(file, toExport); } @@ -156,6 +163,33 @@ public class ReferentialTemporarySpeciesService extends AbstractTuttiService { } + public void exportTemporarySpecies(File file, List<Species> toExport) throws IOException { + + SpeciesModel csvModel = new SpeciesModel(getCsvSeparator()); + + BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); + + List<SpeciesRow> toExportRows = Lists.transform(toExport, new Function<Species, SpeciesRow>() { + @Override + public SpeciesRow apply(Species species) { + return new SpeciesRow(species); + } + }); + + try { + Export export = Export.newExport(csvModel, toExportRows); + export.write(writer); + writer.close(); + } catch (IOException e) { + throw e; + } catch (Exception e) { + throw new ApplicationTechnicalException(t("tutti.service.referential.export.species.error", file), e); + } finally { + IOUtils.closeQuietly(writer); + } + + } + protected ImportRequestResult<Species, Integer> processImportFile(File file, List<Species> existingEntities) { ImportRequestResult<Species, Integer> requestResult = new ImportRequestResult<>(existingEntities, TuttiEntities.<Species>newIdAstIntFunction(), Speciess.GET_NAME); @@ -191,33 +225,6 @@ public class ReferentialTemporarySpeciesService extends AbstractTuttiService { } - protected void exportTemporarySpecies(File file, List<Species> toExport) throws IOException { - - SpeciesModel csvModel = new SpeciesModel(getCsvSeparator()); - - BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); - - List<SpeciesRow> toExportRows = Lists.transform(toExport, new Function<Species, SpeciesRow>() { - @Override - public SpeciesRow apply(Species species) { - return new SpeciesRow(species); - } - }); - - try { - Export export = Export.newExport(csvModel, toExportRows); - export.write(writer); - writer.close(); - } catch (IOException e) { - throw e; - } catch (Exception e) { - throw new ApplicationTechnicalException(t("tutti.service.referential.export.species.error", file), e); - } finally { - IOUtils.closeQuietly(writer); - } - - } - protected void importSpecies(SpeciesRow bean, ImportRequestResult<Species, Integer> requestResult) { Integer id = bean.getIdAsInt(); @@ -287,7 +294,6 @@ public class ReferentialTemporarySpeciesService extends AbstractTuttiService { } protected char getCsvSeparator() { - return context.getConfig().getCsvSeparator(); + return ';'; } - } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java index 2a44997..3bf60de 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java @@ -117,7 +117,7 @@ public class ReferentialTemporaryVesselService extends AbstractTuttiService { return result; } - public void exportExistingTemporaryVessel(File file) throws IOException { + public List<Vessel> getTemporaryVessels() { if (log.isInfoEnabled()) { log.info("Getting all vessels from database"); @@ -132,6 +132,13 @@ public class ReferentialTemporaryVesselService extends AbstractTuttiService { if (log.isInfoEnabled()) { log.info("Got " + toExport.size() + " temporary vessels"); } + return toExport; + + } + + public void exportExistingTemporaryVessel(File file) throws IOException { + + List<Vessel> toExport = getTemporaryVessels(); exportTemporaryVessel(file, toExport); } @@ -176,6 +183,33 @@ public class ReferentialTemporaryVesselService extends AbstractTuttiService { } + + public void exportTemporaryVessel(File file, List<Vessel> toExport) throws IOException { + + VesselModel csvModel = new VesselModel(getCsvSeparator()); + + BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); + + List<VesselRow> toExportRows = Lists.transform(toExport, new Function<Vessel, VesselRow>() { + @Override + public VesselRow apply(Vessel vessel) { + return new VesselRow(vessel); + } + }); + + try { + Export export = Export.newExport(csvModel, toExportRows); + export.write(writer); + writer.close(); + } catch (IOException e) { + throw e; + } catch (Exception e) { + throw new ApplicationTechnicalException(t("tutti.service.referential.export.vessel.error", file), e); + } finally { + IOUtils.closeQuietly(writer); + } + } + protected ImportRequestResult<Vessel, String> processImportFile(File file, List<Vessel> existingEntities) { ImportRequestResult<Vessel, String> requestResult = new ImportRequestResult<>(existingEntities, TuttiEntities.<Vessel>newIdFunction(), Vessels.GET_INTERNAL_REGISTRATION_CODE); @@ -278,34 +312,7 @@ public class ReferentialTemporaryVesselService extends AbstractTuttiService { } - protected void exportTemporaryVessel(File file, List<Vessel> toExport) throws IOException { - - VesselModel csvModel = new VesselModel(getCsvSeparator()); - - BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); - - List<VesselRow> toExportRows = Lists.transform(toExport, new Function<Vessel, VesselRow>() { - @Override - public VesselRow apply(Vessel vessel) { - return new VesselRow(vessel); - } - }); - - try { - Export export = Export.newExport(csvModel, toExportRows); - export.write(writer); - writer.close(); - } catch (IOException e) { - throw e; - } catch (Exception e) { - throw new ApplicationTechnicalException(t("tutti.service.referential.export.vessel.error", file), e); - } finally { - IOUtils.closeQuietly(writer); - } - } - - protected char getCsvSeparator() { - return context.getConfig().getCsvSeparator(); + return ';'; } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.