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 a77918f322811877c4dd5b0d84b352a030809ece Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 27 08:42:52 2016 +0200 Lorsque l'on créé des observations individuelles, on les renvoient dans l'ordre d'entrée --- .../main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java | 2 +- .../java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../service/IndividualObservationBatchPersistenceService.java | 2 +- .../service/IndividualObservationBatchPersistenceServiceImpl.java | 2 +- .../src/main/java/fr/ifremer/tutti/service/PersistenceService.java | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java index b2cf9ab..5945e3a 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java @@ -1378,7 +1378,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public Collection<IndividualObservationBatch> createIndividualObservationBatches(Collection<IndividualObservationBatch> individualObservations) { + public List<IndividualObservationBatch> createIndividualObservationBatches(Collection<IndividualObservationBatch> individualObservations) { return getIndividualObservationBatchService().createIndividualObservationBatches(individualObservations); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java index ea0eba0..edd4a60 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java @@ -927,7 +927,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public Collection<IndividualObservationBatch> createIndividualObservationBatches(Collection<IndividualObservationBatch> individualObservations) { + public List<IndividualObservationBatch> createIndividualObservationBatches(Collection<IndividualObservationBatch> individualObservations) { throw notImplemented(); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceService.java index 75b27f2..6ad5509 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceService.java @@ -55,7 +55,7 @@ public interface IndividualObservationBatchPersistenceService extends TuttiPersi boolean isSamplingCodeAvailable(Integer cruiseId, Integer referenceTaxonId, String samplingCodeSuffix); @Transactional(readOnly = false) - Collection<IndividualObservationBatch> createIndividualObservationBatches(Collection<IndividualObservationBatch> individualObservations); + List<IndividualObservationBatch> createIndividualObservationBatches(Collection<IndividualObservationBatch> individualObservations); @Transactional(readOnly = false) List<IndividualObservationBatch> saveBatchIndividualObservation(Integer batchId, List<IndividualObservationBatch> individualObservation); 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 3af20f5..aad5320 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 @@ -200,7 +200,7 @@ public class IndividualObservationBatchPersistenceServiceImpl extends AbstractPe } @Override - public Collection<IndividualObservationBatch> createIndividualObservationBatches(Collection<IndividualObservationBatch> individualObservations) { + public List<IndividualObservationBatch> createIndividualObservationBatches(Collection<IndividualObservationBatch> individualObservations) { Preconditions.checkNotNull(individualObservations); 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 3318223..c6d1e67 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 @@ -1689,7 +1689,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public Collection<IndividualObservationBatch> createIndividualObservationBatches(Collection<IndividualObservationBatch> individualObservations) { + public List<IndividualObservationBatch> createIndividualObservationBatches(Collection<IndividualObservationBatch> individualObservations) { Optional<CruiseCache> optionalCruiseCache = getOptionalCruiseCache(); @@ -1708,7 +1708,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } - Collection<IndividualObservationBatch> individualObservationBatches = driver.createIndividualObservationBatches(individualObservations); + List<IndividualObservationBatch> individualObservationBatches = driver.createIndividualObservationBatches(individualObservations); if (optionalCruiseCache.isPresent()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.