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 68a81d58a9a969151edd02a1e1dd7f5635a1d698 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 18 08:42:41 2015 +0200 refs #6990 sauvegarde a l'import / export de taxons temporaires des referenceTaxonIds (uniquement pour la partie format generique) --- .../ReferentialTemporarySpeciesService.java | 4 ++-- .../service/referential/csv/SpeciesModel.java | 22 +++++++++++++++------- .../tutti/service/referential/csv/SpeciesRow.java | 14 ++++++++++++++ .../producer/CsvProducerForTemporarySpecies.java | 4 ++-- 4 files changed, 33 insertions(+), 11 deletions(-) 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 a5f57a0..467b769 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 @@ -84,7 +84,7 @@ public class ReferentialTemporarySpeciesService extends AbstractTuttiService { ReferentialImportRequest<Species, Integer> requestResult = createReferentialImportRequest(); - try (CsvConsumerForTemporarySpecies consumer = new CsvConsumerForTemporarySpecies(file.toPath(), getCsvSeparator(), true)) { + try (CsvConsumerForTemporarySpecies consumer = new CsvConsumerForTemporarySpecies(file.toPath(), getCsvSeparator(), false, true)) { for (ImportRow<SpeciesRow> bean : consumer) { @@ -190,7 +190,7 @@ public class ReferentialTemporarySpeciesService extends AbstractTuttiService { public void exportTemporarySpecies(File file, List<Species> toExport) throws IOException { - try (CsvProducerForTemporarySpecies producerForTemporarySpecies = new CsvProducerForTemporarySpecies(file.toPath(), getCsvSeparator())) { + try (CsvProducerForTemporarySpecies producerForTemporarySpecies = new CsvProducerForTemporarySpecies(file.toPath(), getCsvSeparator(), false)) { List<SpeciesRow> dataToExport = producerForTemporarySpecies.getDataToExport(toExport); producerForTemporarySpecies.write(dataToExport); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/SpeciesModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/SpeciesModel.java index 6114fc4..5beccdc 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/SpeciesModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/SpeciesModel.java @@ -37,18 +37,18 @@ import static org.nuiton.i18n.I18n.t; */ public class SpeciesModel extends AbstractTuttiImportExportModel<SpeciesRow> { - public static SpeciesModel forExport(char separator) { + public static SpeciesModel forExport(char separator, boolean addReferenceTaxonId) { SpeciesModel exportModel = new SpeciesModel(separator); - exportModel.forExport(); + exportModel.forExport(addReferenceTaxonId); return exportModel; } - public static SpeciesModel forImport(char separator) { + public static SpeciesModel forImport(char separator, boolean addReferenceTaxonId) { SpeciesModel importModel = new SpeciesModel(separator); - importModel.forImport(); + importModel.forImport(addReferenceTaxonId); return importModel; } @@ -58,10 +58,10 @@ public class SpeciesModel extends AbstractTuttiImportExportModel<SpeciesRow> { return new SpeciesRow(); } - protected void forImport() { + protected void forImport(boolean addReferenceTaxonId) { newMandatoryColumn(SpeciesRow.PROPERTY_ID, new TemporaryReferentialEntityIdParser( - t("tutti.service.referential.import.species.error.idNotNegative")){ + t("tutti.service.referential.import.species.error.idNotNegative")) { @Override protected boolean isTemporaryId(String parse) { @@ -72,14 +72,22 @@ public class SpeciesModel extends AbstractTuttiImportExportModel<SpeciesRow> { newMandatoryColumn(SpeciesRow.PROPERTY_NAME); newMandatoryColumn(SpeciesRow.PROPERTY_TO_DELETE, TuttiCsvUtil.BOOLEAN); + if (addReferenceTaxonId) { + newMandatoryColumn(SpeciesRow.PROPERTY_REFERENCE_TAXON_ID, TuttiCsvUtil.INTEGER); + } + } - protected void forExport() { + protected void forExport(boolean addReferenceTaxonId) { newColumnForExport(SpeciesRow.PROPERTY_ID); newColumnForExport(SpeciesRow.PROPERTY_NAME); newColumnForExport(SpeciesRow.PROPERTY_TO_DELETE); + if (addReferenceTaxonId) { + newColumnForExport(SpeciesRow.PROPERTY_REFERENCE_TAXON_ID, TuttiCsvUtil.INTEGER); + } + } protected SpeciesModel(char separator) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/SpeciesRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/SpeciesRow.java index 88aef6a..b9ce585 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/SpeciesRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/SpeciesRow.java @@ -36,12 +36,16 @@ public class SpeciesRow { public static final String PROPERTY_ID = "id"; + public static final String PROPERTY_REFERENCE_TAXON_ID = "referenceTaxonId"; + public static final String PROPERTY_NAME = "name"; public static final String PROPERTY_TO_DELETE = "toDelete"; protected String id; + protected Integer referenceTaxonId; + protected String name; protected Boolean toDelete; @@ -54,6 +58,8 @@ public class SpeciesRow { super(); Preconditions.checkNotNull(species); setId(species.getId()); + setReferenceTaxonId(species.getReferenceTaxonId()); + setName(species.getName()); } @@ -65,6 +71,14 @@ public class SpeciesRow { this.id = id; } + public Integer getReferenceTaxonId() { + return referenceTaxonId; + } + + public void setReferenceTaxonId(Integer referenceTaxonId) { + this.referenceTaxonId = referenceTaxonId; + } + public String getName() { return name; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporarySpecies.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporarySpecies.java index 0c94be7..ef1e262 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporarySpecies.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporarySpecies.java @@ -42,8 +42,8 @@ import java.util.List; */ public class CsvProducerForTemporarySpecies extends CsvProducer<SpeciesRow, SpeciesModel> { - public CsvProducerForTemporarySpecies(Path file, char separator) { - super(file, SpeciesModel.forExport(separator)); + public CsvProducerForTemporarySpecies(Path file, char separator, boolean addReferenceTaxonId) { + super(file, SpeciesModel.forExport(separator, addReferenceTaxonId)); } public List<SpeciesRow> getDataToExport(List<Species> toExport) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.