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 cdea1edd304af7ab74e3377fdffa34bb37c0933a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 20 13:31:47 2014 +0100 enregistrement des ids des especes non importees --- .../tutti/service/pupitri/PupitriImportResult.java | 23 +++++++++++----------- .../service/pupitri/PupitriImportService.java | 6 +++--- .../pupitri/PupitriImportServiceAno3898Test.java | 3 ++- .../pupitri/PupitriImportServiceAno5032Test.java | 3 ++- .../pupitri/PupitriImportServiceAno5079Test.java | 3 ++- .../pupitri/PupitriImportServiceEvo5060Test.java | 3 ++- .../pupitri/PupitriImportServiceEvo5062Test.java | 3 ++- 7 files changed, 25 insertions(+), 19 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java index 13415ae..04a2d4f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java @@ -22,8 +22,9 @@ package fr.ifremer.tutti.service.pupitri; * #L% */ -import fr.ifremer.tutti.util.Weights; +import com.google.common.collect.ImmutableSet; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.util.Weights; import org.apache.commons.lang3.mutable.MutableFloat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -59,7 +60,7 @@ public class PupitriImportResult { int nbCarrousselImported; - int nbCarrousselNotImported; +// int nbCarrousselNotImported; private Float sortedWeight; @@ -125,7 +126,7 @@ public class PupitriImportResult { } public int getNbCarrousselNotImported() { - return nbCarrousselNotImported; + return notImportedSpeciesIds.size(); } public Float getSortedWeight() { @@ -157,7 +158,7 @@ public class PupitriImportResult { } public Set<String> getNotImportedSpeciesIds() { - return notImportedSpeciesIds; + return ImmutableSet.copyOf(notImportedSpeciesIds); } /** @@ -188,13 +189,13 @@ public class PupitriImportResult { this.nbCarrousselImported++; } - void incrementNbCarrousselNotImported() { - this.nbCarrousselNotImported++; - } +// void incrementNbCarrousselNotImported() { +// this.nbCarrousselNotImported++; +// } - void setNbCarrousselNotImported(int nbCarrousselNotImported) { - this.nbCarrousselNotImported = nbCarrousselNotImported; - } +// void setNbCarrousselNotImported(int nbCarrousselNotImported) { +// this.nbCarrousselNotImported = nbCarrousselNotImported; +// } void setSortedWeight(Float sortedWeight) { this.sortedWeight = sortedWeight; @@ -225,7 +226,7 @@ public class PupitriImportResult { if (aCatch.isMelagMetaSpecies()) { if (log.isInfoEnabled()) { - log.info("Found a MELAG catch: "+aCatch); + log.info("Found a MELAG catch: " + aCatch); } // add weight to melag addMelagTotalWeight(aCatch.getWeight(Signs.DEFAULT)); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java index 74ccc11..8d35c6d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java @@ -254,7 +254,7 @@ public class PupitriImportService extends AbstractTuttiService { Float carrouselSortedWeight = 0f; List<PupitriCatch> catches = Lists.newArrayList(); - Set<String> notFoundSpecies = Sets.newHashSet(); +// Set<String> notFoundSpecies = Sets.newHashSet(); Import<CarrouselRow> importer = null; @@ -299,7 +299,7 @@ public class PupitriImportService extends AbstractTuttiService { } pupitriCatch.addToSign(bean.getSign(), beanWeight); } else { - notFoundSpecies.add(speciesId); + result.addNotImportedSpeciesId(speciesId); } } } @@ -318,7 +318,7 @@ public class PupitriImportService extends AbstractTuttiService { FileUtils.deleteQuietly(fileWithHeaders); } - result.setNbCarrousselNotImported(notFoundSpecies.size()); +// result.setNbCarrousselNotImported(notFoundSpecies.size()); result.setCarrouselSortedWeight(Weights.roundKiloGram(carrouselSortedWeight)); result.setCatches(catches); } diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java index 830271b..2eb0b28 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java @@ -105,7 +105,8 @@ public class PupitriImportServiceAno3898Test { BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(3, rootSpeciesBatch.sizeChildren()); - int nbNotAdded = service.importPupitri(trunk, carroussel, operation, catchBatch).getNbCarrousselNotImported(); + PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); + int nbNotAdded = pupitriImportResult.getNbCarrousselNotImported(); Assert.assertEquals(0, nbNotAdded); BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(31, rootSpeciesBatchAfter.sizeChildren()); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java index f088049..dc17050 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java @@ -112,7 +112,8 @@ public class PupitriImportServiceAno5032Test { BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(3, rootSpeciesBatch.sizeChildren()); - int nbNotAdded = service.importPupitri(trunk, carroussel, operation, catchBatch).getNbCarrousselNotImported(); + PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); + int nbNotAdded = pupitriImportResult.getNbCarrousselNotImported(); Assert.assertEquals(4, nbNotAdded); BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(4, rootSpeciesBatchAfter.sizeChildren()); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java index ac14ef1..4294b67 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java @@ -122,7 +122,8 @@ public class PupitriImportServiceAno5079Test { BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(3, rootSpeciesBatch.sizeChildren()); - int nbNotAdded = service.importPupitri(trunk, carroussel, operation, catchBatch).getNbCarrousselNotImported(); + PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); + int nbNotAdded = pupitriImportResult.getNbCarrousselNotImported(); Assert.assertEquals(0, nbNotAdded); BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(5, rootSpeciesBatchAfter.sizeChildren()); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java index e361ac0..7cacb22 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java @@ -115,7 +115,8 @@ public class PupitriImportServiceEvo5060Test { BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(3, rootSpeciesBatch.sizeChildren()); - int nbNotAdded = service.importPupitri(trunk, carroussel, operation, catchBatch).getNbCarrousselNotImported(); + PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); + int nbNotAdded = pupitriImportResult.getNbCarrousselNotImported(); Assert.assertEquals(0, nbNotAdded); BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(3, rootSpeciesBatchAfter.sizeChildren()); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java index 4f54a76..430a8ca 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java @@ -116,7 +116,8 @@ public class PupitriImportServiceEvo5062Test { BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(3, rootSpeciesBatch.sizeChildren()); - int nbNotAdded = service.importPupitri(trunk, carroussel, operation, catchBatch).getNbCarrousselNotImported(); + PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); + int nbNotAdded = pupitriImportResult.getNbCarrousselNotImported(); Assert.assertEquals(0, nbNotAdded); BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(9, rootSpeciesBatchAfter.sizeChildren()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.