This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 984e593beaf0ad5a262fea35b0c4b6162d6d2257 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 17:41:43 2015 +0100 use immutable list and not set + remove todo --- .../genericformat/GenericFormatImportOperationContext.java | 9 +++++---- .../genericformat/GenericformatImportPersitenceHelper.java | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java index f0f107f..bce9d5b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java @@ -1,5 +1,6 @@ package fr.ifremer.tutti.service.genericformat; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; @@ -132,19 +133,19 @@ public class GenericFormatImportOperationContext { } public Collection<MarineLitterBatch> getMarineLitterBatches() { - return ImmutableSet.copyOf(marineLitterBatches); + return ImmutableList.copyOf(marineLitterBatches); } public Collection<AccidentalBatch> getAccidentalBatches() { - return ImmutableSet.copyOf(accidentalBatchesById.values()); + return ImmutableList.copyOf(accidentalBatchesById.values()); } public Collection<IndividualObservationBatch> getIndividualObservationBatches() { - return ImmutableSet.copyOf(individualObservationBatchesById.values()); + return ImmutableList.copyOf(individualObservationBatchesById.values()); } public Collection<SpeciesBatch> getSpeciesBatches() { - return ImmutableSet.copyOf(speciesBatches); + return ImmutableList.copyOf(speciesBatches); } public Collection<BenthosBatch> getBenthosBatches() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java index 78e7542..5ba021e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java @@ -187,8 +187,6 @@ public class GenericformatImportPersitenceHelper { if (log.isInfoEnabled()) { log.info("Persist " + individualObservationBatches.size() + " individual observation(s) of " + fishingOperationContext.getFishingOperationLabel() + " of cruise: " + cruiseDecorator.toString(fishingOperation.getCruise())); } - - //TODO must reset caracteristics values for size, weight, ... using pmfmId persistenceService.createIndividualObservationBatches(fishingOperationId, individualObservationBatches); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.