This is an automated email from the git hooks/post-receive script. New commit to branch feature/8130 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 5c4d5c50a57c841b8b87723702c4c1c0da8ff8ae Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 16 07:53:00 2016 +0100 bien enregistrer la valeur qualitative de mode de recopie et non pas la valeur de l'enum + rennomage de la méthode d'extraction des caractéristiques de Sample --- .../persistence/service/AccidentalBatchPersistenceServiceImpl.java | 2 +- .../service/IndividualObservationBatchPersistenceServiceImpl.java | 7 +++++-- .../tutti/persistence/service/util/SamplePersistenceHelper.java | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java index d99d1da..d613639 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java @@ -271,7 +271,7 @@ public class AccidentalBatchPersistenceServiceImpl extends AbstractPersistenceSe // Prepare sample measurements - CaracteristicMap caracteristics = samplePersistenceHelper.extractCaracteristics(source); + CaracteristicMap caracteristics = samplePersistenceHelper.extractCommonSampleCaracteristics(source); if (source.getDeadOrAlive() != null) { caracteristics.put(caracteristicService.getDeadOrAliveCaracteristic(), source.getDeadOrAlive()); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java index a6bbe48..d75a906 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java @@ -294,11 +294,14 @@ public class IndividualObservationBatchPersistenceServiceImpl extends AbstractPe // Prepare sample measurements - CaracteristicMap caracteristics = samplePersistenceHelper.extractCaracteristics(source); + CaracteristicMap caracteristics = samplePersistenceHelper.extractCommonSampleCaracteristics(source); CopyIndividualObservationMode copyIndividualObservationMode = source.getCopyIndividualObservationMode(); Objects.requireNonNull(copyIndividualObservationMode, "Any individual observation requires a copy mode"); - caracteristics.put(caracteristicService.getCopyIndividualObservationModeCaracteristic(), copyIndividualObservationMode); + + Caracteristic copyIndividualObservationModeCaracteristic = caracteristicService.getCopyIndividualObservationModeCaracteristic(); + CaracteristicQualitativeValue qualitativeValue = copyIndividualObservationMode.getQualitativeValue(copyIndividualObservationModeCaracteristic); + caracteristics.put(copyIndividualObservationModeCaracteristic, qualitativeValue); samplePersistenceHelper.setSampleMeasurements(target, caracteristics); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SamplePersistenceHelper.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SamplePersistenceHelper.java index 2893a31..36c2ddc 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SamplePersistenceHelper.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SamplePersistenceHelper.java @@ -180,7 +180,7 @@ public class SamplePersistenceHelper extends AbstractPersistenceService { } - public <S extends SampleEntity> CaracteristicMap extractCaracteristics(S sample) { + public <S extends SampleEntity> CaracteristicMap extractCommonSampleCaracteristics(S sample) { CaracteristicMap caracteristics = CaracteristicMap.copy(sample.getCaracteristics()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.