This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 15c4c064c10d0cf318d1ca473e2e6cdb2d62e59d Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 20 14:56:41 2015 +0100 Correction d'une NPE à l'export du plan scléro (fixes #6486) --- .../wao/services/service/csv/SamplingPlanImportExportModel.java | 7 ++++++- .../services/service/SclerochronologySamplingPlanServiceTest.java | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SamplingPlanImportExportModel.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SamplingPlanImportExportModel.java index 0c075e4..d8af8f8 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SamplingPlanImportExportModel.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SamplingPlanImportExportModel.java @@ -24,6 +24,7 @@ package fr.ifremer.wao.services.service.csv; +import com.google.common.collect.ImmutableSet; import com.opensymphony.xwork2.util.logging.Logger; import com.opensymphony.xwork2.util.logging.LoggerFactory; import fr.ifremer.wao.entity.FishingZone; @@ -38,6 +39,7 @@ import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowImpl; import fr.ifremer.wao.entity.SamplingStrategy; import fr.ifremer.wao.entity.SclerochronologySamplingContext; +import fr.ifremer.wao.entity.Species; import fr.ifremer.wao.entity.TerrestrialLocation; import fr.ifremer.wao.services.service.administration.ReferentialService; import fr.ifremer.wao.services.service.csv.operations.Dcf5CodesParserFormatter; @@ -129,6 +131,8 @@ public class SamplingPlanImportExportModel implements ImportExportModel<SampleRo protected ModelBuilder<SampleRow> modelBuilder; + protected ImmutableSet<Species> allSpecies; + protected PeriodDates periodDates; /** Pour l'export */ @@ -149,6 +153,7 @@ public class SamplingPlanImportExportModel implements ImportExportModel<SampleRo this.fishingZones = fishingZones; this.terrestrialDistricts = terrestrialDistricts; this.referentialService = referentialService; + this.allSpecies = referentialService.getAllSpecies(); } @Override @@ -222,7 +227,7 @@ public class SamplingPlanImportExportModel implements ImportExportModel<SampleRo } if (obsProgram.isSclerochronology()) { - modelBuilder.newColumnForImportExport("ESPECE_CIBLE", SampleRow.PROPERTY_SPECIES, new SpeciesParserFormatter(locale, referentialService.getAllSpecies())); + modelBuilder.newColumnForImportExport("ESPECE_CIBLE", SampleRow.PROPERTY_SPECIES, new SpeciesParserFormatter(locale, allSpecies)); modelBuilder.newColumnForImportExport("CONTEXTE", SampleRow.PROPERTY_SCLEROCHRONOLOGY_SAMPLING_CONTEXT, new I18nAbleParserFormatter<>(locale, SclerochronologySamplingContext.values())); modelBuilder.newColumnForImportExport("CONTEXTE_COMPLEMENT", SampleRow.PROPERTY_SCLEROCHRONOLOGY_SAMPLING_CONTEXT_INFO); modelBuilder.newColumnForImportExport("MESURES", SampleRow.PROPERTY_INDIVIDUAL_MEASUREMENT_STRATEGY, new I18nAbleParserFormatter<>(locale, IndividualMeasurementStrategy.values())); diff --git a/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java b/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java index 2618224..c678180 100644 --- a/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java +++ b/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java @@ -166,4 +166,12 @@ public class SclerochronologySamplingPlanServiceTest extends AbstractWaoServiceT Assert.assertEquals(53, samplingPlan.getHighTotalEffortInIndividuals().getReal().intValue()); } + + @Test + public void testExportSamplingPlan() { + fixtures.samplingPlan(); + + SampleRowsFilter filter = service.newSampleRowsFilter(fixtures.admin()); + service.exportSamplingPlan(filter); + } } \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.