branch develop updated (a22c103 -> d7ebcc4)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from a22c103 Livrable #8190 Merge branch 'feature/8190' into develop new 74e40d3 Utilisation du bon identifiant pour supprimer un lot (See #8136) new 4705d3f Ajout toString sur SampleData new c09526f On ne peut supprimer que des observations qui ont une taille new d7ebcc4 Livrable #8136 Merge branch 'feature/8136' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d7ebcc4f08d0a53f07fe5c28c77d22d9b7a47c6e Merge: a22c103 c09526f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 07:09:08 2016 +0200 Livrable #8136 Merge branch 'feature/8136' into develop commit c09526f04d915ed6c3fda1c2461ae65b29a6efa8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 06:59:53 2016 +0200 On ne peut supprimer que des observations qui ont une taille commit 4705d3f8bfdf4eea32e38ff54155b5c7514c873f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 06:59:17 2016 +0200 Ajout toString sur SampleData commit 74e40d319b1fb95df74e3073ebecdd28456dbcb9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 06:58:27 2016 +0200 Utilisation du bon identifiant pour supprimer un lot (See #8136) Summary of changes: .../main/java/fr/ifremer/tutti/service/PersistenceService.java | 4 ++-- .../fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java | 4 ++-- .../tutti/service/sampling/CruiseSamplingInternalCache.java | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 74e40d319b1fb95df74e3073ebecdd28456dbcb9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 06:58:27 2016 +0200 Utilisation du bon identifiant pour supprimer un lot (See #8136) --- .../src/main/java/fr/ifremer/tutti/service/PersistenceService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java index 6616593..93777d3 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java @@ -1708,12 +1708,12 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer batchIds.forEach(speciesBatchId -> { - List<IndividualObservationBatch> allIndividualObservationBatchsForBatch = getAllIndividualObservationBatchsForBatch(id); + List<IndividualObservationBatch> allIndividualObservationBatchsForBatch = getAllIndividualObservationBatchsForBatch(speciesBatchId); if (!allIndividualObservationBatchsForBatch.isEmpty()) { if (log.isInfoEnabled()) { - log.info("Remove for species or benthos batch: " + id + " - " + allIndividualObservationBatchsForBatch.size() + " individual observations from cruiseSamplingCache: " + cruiseSamplingCache); + log.info("Remove for species or benthos batch: " + speciesBatchId + " - " + allIndividualObservationBatchsForBatch.size() + " individual observations from cruiseSamplingCache: " + cruiseSamplingCache); } cruiseSamplingCache.removeIndividualObservations(fishingOperationId, optionalZone, allIndividualObservationBatchsForBatch); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 4705d3f8bfdf4eea32e38ff54155b5c7514c873f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 06:59:17 2016 +0200 Ajout toString sur SampleData --- .../tutti/service/sampling/CruiseSamplingInternalCache.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingInternalCache.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingInternalCache.java index f59753d..c679876 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingInternalCache.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingInternalCache.java @@ -24,6 +24,7 @@ package fr.ifremer.tutti.service.sampling; * #L% */ +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; @@ -279,6 +280,13 @@ class CruiseSamplingInternalCache implements Closeable { return samplingNb == 0 && observationNb == 0; } + @Override + public String toString() { + return MoreObjects.toStringHelper(SamplingData.class) + .add("observationNb", observationNb) + .add("samplingNb", samplingNb) + .toString(); + } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit c09526f04d915ed6c3fda1c2461ae65b29a6efa8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 06:59:53 2016 +0200 On ne peut supprimer que des observations qui ont une taille --- .../java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java index e1d5c86..64ac5a8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java @@ -415,7 +415,8 @@ public class CruiseSamplingCache implements Closeable { Objects.requireNonNull(optionalZone); Objects.requireNonNull(individualObservationBatches); - individualObservationBatches.forEach(individualObservationBatch -> { + individualObservationBatches.stream() + .filter(individualObservationBatch -> individualObservationBatch.getSize() != null).forEach(individualObservationBatch -> { Species species = individualObservationBatch.getSpecies(); Objects.requireNonNull(species); @@ -427,7 +428,6 @@ public class CruiseSamplingCache implements Closeable { CaracteristicQualitativeValue gender = individualObservationBatch.getCaracteristics().getQualitativeValue(sexCaracteristic); - String samplingCode = individualObservationBatch.getSamplingCode(); if (samplingCode != null) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit d7ebcc4f08d0a53f07fe5c28c77d22d9b7a47c6e Merge: a22c103 c09526f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 07:09:08 2016 +0200 Livrable #8136 Merge branch 'feature/8136' into develop .../main/java/fr/ifremer/tutti/service/PersistenceService.java | 4 ++-- .../fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java | 4 ++-- .../tutti/service/sampling/CruiseSamplingInternalCache.java | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm