Author: tchemit Date: 2013-02-05 10:48:26 +0100 (Tue, 05 Feb 2013) New Revision: 331 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/331 Log: add changeSpeciesBatchSpecies method Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImplTest.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-02-05 09:19:16 UTC (rev 330) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-02-05 09:48:26 UTC (rev 331) @@ -299,6 +299,9 @@ @Transactional(readOnly = false) void deleteSpeciesSubBatch(String id); + @Transactional(readOnly = false) + void changeSpeciesBatchSpecies(String batchId, Species species); + List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency( String speciesBatchId); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-05 09:19:16 UTC (rev 330) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-05 09:48:26 UTC (rev 331) @@ -628,6 +628,11 @@ persistToFile(SpeciesBatch.class.getName()); } + @Override + public void changeSpeciesBatchSpecies(String batchId, Species species) { + throw new IllegalStateException("method 'changeSpeciesBatchSpecies' not implemented"); + } + protected void collectChilds(SpeciesBatch bean, Set<SpeciesBatch> collected) { if (!bean.isChildBatchsEmpty()) { for (SpeciesBatch batch : bean.getChildBatchs()) { Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-05 09:19:16 UTC (rev 330) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-05 09:48:26 UTC (rev 331) @@ -457,6 +457,11 @@ } @Override + public void changeSpeciesBatchSpecies(String batchId, Species species) { + speciesBatchService.changeSpeciesBatchSpecies(batchId, species); + } + + @Override public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(String speciesBatchId) { return speciesBatchService.getAllSpeciesBatchFrequency(speciesBatchId); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java 2013-02-05 09:19:16 UTC (rev 330) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java 2013-02-05 09:48:26 UTC (rev 331) @@ -27,6 +27,7 @@ import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; +import fr.ifremer.tutti.persistence.entities.referential.Species; import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -61,7 +62,17 @@ @Transactional(readOnly = false) void deleteSpeciesSubBatch(String id); + /** + * Change the species in the given {@code batchId} and in all his + * sub batches. + * + * @param batchId id of the root species batch to treat + * @param species species to affect to all batches + */ @Transactional(readOnly = false) + void changeSpeciesBatchSpecies(String batchId, Species species); + + @Transactional(readOnly = false) List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(String speciesBatchId, List<SpeciesBatchFrequency> frequencies); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-02-05 09:19:16 UTC (rev 330) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-02-05 09:48:26 UTC (rev 331) @@ -229,6 +229,11 @@ } @Override + public void changeSpeciesBatchSpecies(String batchId, Species species) { + //TODO + } + + @Override public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency( String speciesBatchId) { List<SpeciesBatchFrequency> results = Lists.newArrayList(); @@ -239,6 +244,7 @@ @Override public List<SpeciesBatchFrequency> saveSpeciesBatchFrequency( String speciesBatchId, List<SpeciesBatchFrequency> frequencies) { + //TODO return frequencies; } Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImplTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImplTest.java 2013-02-05 09:19:16 UTC (rev 330) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImplTest.java 2013-02-05 09:48:26 UTC (rev 331) @@ -113,6 +113,11 @@ } @Test + public void changeSpeciesBatchSpecies() { + //TODO + } + + @Test public void createAndSaveCatchBatch() throws Exception { CatchBatch catchBatch = null; CatchBatch createdCatchBatch = null;