[Tutti-commits] r212 - in trunk: tutti-persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service

Author: tchemit Date: 2013-01-16 23:43:39 +0100 (Wed, 16 Jan 2013) New Revision: 212 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/212 Log: refs #1920: [Persistence] Adagio Donn?\195?\169es th?\195?\169matiques (use Transactional annotation on contract) + reformat code Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceTest.java trunk/tutti-persistence/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence/pom.xml 2013-01-16 22:43:39 UTC (rev 212) @@ -63,6 +63,11 @@ <artifactId>commons-logging</artifactId> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </dependency> + </dependencies> <build> 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-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-01-16 22:43:39 UTC (rev 212) @@ -43,6 +43,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.Zone; +import org.springframework.transaction.annotation.Transactional; import java.io.Closeable; import java.io.IOException; @@ -54,6 +55,7 @@ * @author tchemit <chemit@codelutin.com> * @since 0.1 */ +@Transactional(readOnly = true) public interface TuttiPersistence extends Closeable { //------------------------------------------------------------------------// @@ -154,8 +156,10 @@ Program getProgram(String id); + @Transactional(readOnly = false) Program createProgram(Program bean); + @Transactional(readOnly = false) Program saveProgram(Program bean); //------------------------------------------------------------------------// @@ -166,8 +170,10 @@ Cruise getCruise(String id); + @Transactional(readOnly = false) Cruise createCruise(Cruise bean); + @Transactional(readOnly = false) Cruise saveCruise(Cruise bean); //------------------------------------------------------------------------// @@ -178,8 +184,10 @@ TuttiProtocol getProtocol(String id); + @Transactional(readOnly = false) TuttiProtocol createProtocol(TuttiProtocol bean); + @Transactional(readOnly = false) TuttiProtocol saveProtocol(TuttiProtocol bean); //------------------------------------------------------------------------// @@ -190,8 +198,10 @@ FishingOperation getFishingOperation(String id); + @Transactional(readOnly = false) FishingOperation createFishingOperation(FishingOperation bean); + @Transactional(readOnly = false) FishingOperation saveFishingOperation(FishingOperation bean); //------------------------------------------------------------------------// @@ -204,17 +214,22 @@ SpeciesBatch getSpeciesBatch(String id); + @Transactional(readOnly = false) SpeciesBatch createSpeciesBatch(SpeciesBatch bean, String parentBatchId); + @Transactional(readOnly = false) SpeciesBatch saveSpeciesBatch(SpeciesBatch bean); + @Transactional(readOnly = false) void deleteSpeciesBatch(String id); + @Transactional(readOnly = false) void deleteSpeciesSubBatch(String id); List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency( String speciesBatchId); + @Transactional(readOnly = false) List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(String speciesBatchId, List<SpeciesBatchFrequency> frequencies); @@ -226,10 +241,13 @@ BenthosBatch getBenthosBatch(String id); + @Transactional(readOnly = false) BenthosBatch createBenthosBatch(BenthosBatch bean); + @Transactional(readOnly = false) BenthosBatch saveBenthosBatch(BenthosBatch bean); + @Transactional(readOnly = false) void deleteBenthosBatch(String id); //------------------------------------------------------------------------// @@ -240,10 +258,13 @@ PlanktonBatch getPlanktonBatch(String id); + @Transactional(readOnly = false) PlanktonBatch createPlanktonBatch(PlanktonBatch bean); + @Transactional(readOnly = false) PlanktonBatch savePlanktonBatch(PlanktonBatch bean); + @Transactional(readOnly = false) void deletePlanktonBatch(String id); //------------------------------------------------------------------------// @@ -254,10 +275,13 @@ MacroWasteBatch getMacroWasteBatch(String id); + @Transactional(readOnly = false) MacroWasteBatch createMacroWasteBatch(MacroWasteBatch bean); + @Transactional(readOnly = false) MacroWasteBatch saveMacroWasteBatch(MacroWasteBatch bean); + @Transactional(readOnly = false) void deleteMacroWasteBatch(String id); //------------------------------------------------------------------------// @@ -268,9 +292,12 @@ AccidentalBatch getAccidentalBatch(String id); + @Transactional(readOnly = false) AccidentalBatch createAccidentalBatch(AccidentalBatch bean); + @Transactional(readOnly = false) AccidentalBatch saveAccidentalBatch(AccidentalBatch bean); + @Transactional(readOnly = false) void deleteAccidentalBatch(String id); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java 2013-01-16 22:43:39 UTC (rev 212) @@ -25,6 +25,7 @@ */ import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -34,15 +35,19 @@ * @author tchemit <chemit@codelutin.com> * @since 0.3 */ +@Transactional(readOnly = true) public interface AccidentalBatchPersistenceService { List<AccidentalBatch> getAllAccidentalBatch(String fishingOperationId); AccidentalBatch getAccidentalBatch(String id); + @Transactional(readOnly = false) AccidentalBatch createAccidentalBatch(AccidentalBatch bean); + @Transactional(readOnly = false) AccidentalBatch saveAccidentalBatch(AccidentalBatch bean); + @Transactional(readOnly = false) void deleteAccidentalBatch(String id); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java 2013-01-16 22:43:39 UTC (rev 212) @@ -25,6 +25,7 @@ */ import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -34,15 +35,19 @@ * @author tchemit <chemit@codelutin.com> * @since 0.3 */ +@Transactional(readOnly = true) public interface BenthosBatchPersistenceService { List<BenthosBatch> getAllBenthosBatch(String fishingOperationId); BenthosBatch getBenthosBatch(String id); + @Transactional(readOnly = false) BenthosBatch createBenthosBatch(BenthosBatch bean); + @Transactional(readOnly = false) BenthosBatch saveBenthosBatch(BenthosBatch bean); + @Transactional(readOnly = false) void deleteBenthosBatch(String id); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java 2013-01-16 22:43:39 UTC (rev 212) @@ -25,6 +25,7 @@ */ import fr.ifremer.tutti.persistence.entities.data.Cruise; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -34,13 +35,16 @@ * @author tchemit <chemit@codelutin.com> * @since 0.3 */ +@Transactional(readOnly = true) public interface CruisePersistenceService { List<Cruise> getAllCruise(String programId); Cruise getCruise(String id); + @Transactional(readOnly = false) Cruise createCruise(Cruise bean); + @Transactional(readOnly = false) Cruise saveCruise(Cruise bean); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java 2013-01-16 22:43:39 UTC (rev 212) @@ -25,6 +25,7 @@ */ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -34,13 +35,16 @@ * @author tchemit <chemit@codelutin.com> * @since 0.3 */ +@Transactional(readOnly = true) public interface FishingOperationPersistenceService { List<FishingOperation> getAllFishingOperation(String cruiseId); FishingOperation getFishingOperation(String id); + @Transactional(readOnly = false) FishingOperation createFishingOperation(FishingOperation bean); + @Transactional(readOnly = false) FishingOperation saveFishingOperation(FishingOperation bean); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceService.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceService.java 2013-01-16 22:43:39 UTC (rev 212) @@ -25,6 +25,7 @@ */ import fr.ifremer.tutti.persistence.entities.data.MacroWasteBatch; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -34,16 +35,19 @@ * @author tchemit <chemit@codelutin.com> * @since 0.3 */ +@Transactional(readOnly = true) public interface MacroWasteBatchPersistenceService { - List<MacroWasteBatch> getAllMacroWasteBatch(String fishingOperationId); MacroWasteBatch getMacroWasteBatch(String id); + @Transactional(readOnly = false) MacroWasteBatch createMacroWasteBatch(MacroWasteBatch bean); + @Transactional(readOnly = false) MacroWasteBatch saveMacroWasteBatch(MacroWasteBatch bean); + @Transactional(readOnly = false) void deleteMacroWasteBatch(String id); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceService.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceService.java 2013-01-16 22:43:39 UTC (rev 212) @@ -25,6 +25,7 @@ */ import fr.ifremer.tutti.persistence.entities.data.PlanktonBatch; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -34,15 +35,19 @@ * @author tchemit <chemit@codelutin.com> * @since 0.3 */ +@Transactional(readOnly = true) public interface PlanktonBatchPersistenceService { List<PlanktonBatch> getAllPlanktonBatch(String fishingOperationId); PlanktonBatch getPlanktonBatch(String id); + @Transactional(readOnly = false) PlanktonBatch createPlanktonBatch(PlanktonBatch bean); + @Transactional(readOnly = false) PlanktonBatch savePlanktonBatch(PlanktonBatch bean); + @Transactional(readOnly = false) void deletePlanktonBatch(String id); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceService.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceService.java 2013-01-16 22:43:39 UTC (rev 212) @@ -25,6 +25,7 @@ */ import fr.ifremer.tutti.persistence.entities.data.Program; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -34,13 +35,16 @@ * @author tchemit <chemit@codelutin.com> * @since 0.3 */ +@Transactional(readOnly = true) public interface ProgramPersistenceService { List<Program> getAllProgram(); Program getProgram(String id); + @Transactional(readOnly = false) Program createProgram(Program bean); + @Transactional(readOnly = false) Program saveProgram(Program bean); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java 2013-01-16 22:43:39 UTC (rev 212) @@ -25,6 +25,7 @@ */ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -34,13 +35,16 @@ * @author tchemit <chemit@codelutin.com> * @since 0.3 */ +@Transactional(readOnly = true) public interface ProtocolPersistenceService { List<TuttiProtocol> getAllProtocol(); TuttiProtocol getProtocol(String id); + @Transactional(readOnly = false) TuttiProtocol createProtocol(TuttiProtocol bean); + @Transactional(readOnly = false) TuttiProtocol saveProtocol(TuttiProtocol bean); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-01-16 22:43:39 UTC (rev 212) @@ -35,6 +35,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.Zone; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -44,6 +45,7 @@ * @author tchemit <chemit@codelutin.com> * @since 0.3 */ +@Transactional(readOnly = true) public interface ReferentialPersistenceService { //------------------------------------------------------------------------// 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-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java 2013-01-16 22:43:39 UTC (rev 212) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -35,26 +36,31 @@ * @author tchemit <chemit@codelutin.com> * @since 0.3 */ +@Transactional(readOnly = true) public interface SpeciesBatchPersistenceService { - List<SpeciesBatch> getAllRootSpeciesBatch(String fishingOperationId); List<SpeciesBatch> getAllSpeciesBatch(String fishingOperationId); SpeciesBatch getSpeciesBatch(String id); + List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency( + String speciesBatchId); + + @Transactional(readOnly = false) SpeciesBatch createSpeciesBatch(SpeciesBatch bean, String parentBatchId); + @Transactional(readOnly = false) SpeciesBatch saveSpeciesBatch(SpeciesBatch bean); + @Transactional(readOnly = false) void deleteSpeciesBatch(String id); + @Transactional(readOnly = false) void deleteSpeciesSubBatch(String id); - List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency( - String speciesBatchId); - + @Transactional(readOnly = false) List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(String speciesBatchId, List<SpeciesBatchFrequency> frequencies); Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java 2013-01-16 22:43:39 UTC (rev 212) @@ -57,7 +57,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; import java.io.IOException; import java.util.List; @@ -66,7 +65,6 @@ * @author tchemit <chemit@codelutin.com> * @since 0.2 */ -@Transactional(readOnly = true) public class TuttiPersistenceAdagioImpl implements TuttiPersistence { /** Logger. */ @@ -79,7 +77,6 @@ @Autowired(required = true) protected ProgramPersistenceService programService; - @Autowired(required = true) protected CruisePersistenceService cruiseService; Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java 2013-01-16 22:43:39 UTC (rev 212) @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -37,7 +36,6 @@ * @since 0.3 */ @Service("accidentalBatchPersistenceService") -@Transactional(readOnly = true) public class AccidentalBatchPersistenceServiceImpl extends AbstractPersistenceService implements AccidentalBatchPersistenceService { /** Logger. */ Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-01-16 22:43:39 UTC (rev 212) @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -37,7 +36,6 @@ * @since 0.3 */ @Service("benthosBatchPersistenceService") -@Transactional(readOnly = true) public class BenthosBatchPersistenceServiceImpl extends AbstractPersistenceService implements BenthosBatchPersistenceService { /** Logger. */ Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-01-16 22:43:39 UTC (rev 212) @@ -47,12 +47,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataRetrievalFailureException; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; - import java.sql.Timestamp; -import java.text.MessageFormat; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -64,7 +61,6 @@ * @since 0.3 */ @Service("cruisePersistenceService") -@Transactional(readOnly = true) public class CruisePersistenceServiceImpl extends AbstractPersistenceService implements CruisePersistenceService { /** Logger. */ @@ -124,7 +120,7 @@ "countryLocationLevelId", IntegerType.INSTANCE, enumeration.LOCATION_LEVEL_ID_COUNTRY); if (source == null) { - throw new DataRetrievalFailureException("Could not retrieve cruise with id=" + id); + throw new DataRetrievalFailureException("Could not retrieve cruise with id=" + id); } Cruise result = new Cruise(); result.setId(id); @@ -147,94 +143,89 @@ Timestamp beginDate = (Timestamp) source[6]; if (beginDate != null && result.getYear() != null) { - calendar.setTimeInMillis(0); - calendar.set(Calendar.YEAR, result.getYear()); - calendar.add(Calendar.MILLISECOND, 1); - // Comparison with getTime() is need, to keep millisecond precision - if (beginDate.getTime() == calendar.getTimeInMillis()) { + calendar.setTimeInMillis(0); + calendar.set(Calendar.YEAR, result.getYear()); + calendar.add(Calendar.MILLISECOND, 1); + // Comparison with getTime() is need, to keep millisecond precision + if (beginDate.getTime() == calendar.getTimeInMillis()) { // if BeginDate is fake : set to null (see createCruise for details) - result.setBeginDate(null); - } - else { - result.setBeginDate(new Date(beginDate.getTime())); - } + result.setBeginDate(null); + } else { + result.setBeginDate(new Date(beginDate.getTime())); + } } - + result.setEndDate((Date) source[7]); - + String vesselCode = (String) source[8]; Vessel vessel = referentielService.getVessel(vesselCode); result.setVessel(Lists.newArrayList(vessel)); Integer managerId = (Integer) source[9]; - if (managerId != null && managerId.equals(enumeration.PERSON_ID_UNKNOWN_RECORDER_PERSON)) { - result.setHeadOfMission(null); - } - else { + if (managerId != null && managerId.equals(enumeration.PERSON_ID_UNKNOWN_RECORDER_PERSON)) { + result.setHeadOfMission(null); + } else { Person manager = referentielService.getPerson(managerId); result.setHeadOfMission(Lists.newArrayList(manager)); - } + } result.setComment((String) source[10]); - + String miscData = (String) source[11]; if (miscData != null && miscData.length() > 0) { - - // Retrieve gears : - int gearTagIndex = miscData.indexOf(CRUISE_MISC_DATA_GEARS_TAG); - if (gearTagIndex == -1) { - result.setGear(null); - } - else { - String gearIdsStr = miscData.substring(gearTagIndex + CRUISE_MISC_DATA_GEARS_TAG.length()).trim(); - miscData = miscData.substring(0, gearTagIndex); - if (gearIdsStr.isEmpty()) { - result.setGear(null); - } - else { - List<Gear> gears = Lists.newArrayList(); - String[] gearIds = gearIdsStr.split(","); - for (int i = 0; i < gearIds.length; i++) { - Integer gearId = Integer.valueOf(gearIds[i]); - gears.add(referentielService.getGear(gearId)); - } - result.setGear(gears); - } - } - - // Retrieve secondary vessels : - int vesselTagIndex = miscData.indexOf(CRUISE_MISC_DATA_VESSELS_TAG); - if (vesselTagIndex != -1) { - String vesselCodesStr = miscData.substring(vesselTagIndex + CRUISE_MISC_DATA_VESSELS_TAG.length()).trim(); - if (!vesselCodesStr.isEmpty()) { - String[] vesselCodes = vesselCodesStr.split(","); - for (int i = 0; i < vesselCodes.length; i++) { - vesselCode = vesselCodes[i]; - result.addVessel(referentielService.getVessel(vesselCode)); - } - } - } + + // Retrieve gears : + int gearTagIndex = miscData.indexOf(CRUISE_MISC_DATA_GEARS_TAG); + if (gearTagIndex == -1) { + result.setGear(null); + } else { + String gearIdsStr = miscData.substring(gearTagIndex + CRUISE_MISC_DATA_GEARS_TAG.length()).trim(); + miscData = miscData.substring(0, gearTagIndex); + if (gearIdsStr.isEmpty()) { + result.setGear(null); + } else { + List<Gear> gears = Lists.newArrayList(); + String[] gearIds = gearIdsStr.split(","); + for (int i = 0; i < gearIds.length; i++) { + Integer gearId = Integer.valueOf(gearIds[i]); + gears.add(referentielService.getGear(gearId)); + } + result.setGear(gears); + } + } + + // Retrieve secondary vessels : + int vesselTagIndex = miscData.indexOf(CRUISE_MISC_DATA_VESSELS_TAG); + if (vesselTagIndex != -1) { + String vesselCodesStr = miscData.substring(vesselTagIndex + CRUISE_MISC_DATA_VESSELS_TAG.length()).trim(); + if (!vesselCodesStr.isEmpty()) { + String[] vesselCodes = vesselCodesStr.split(","); + for (int i = 0; i < vesselCodes.length; i++) { + vesselCode = vesselCodes[i]; + result.addVessel(referentielService.getVessel(vesselCode)); + } + } + } } - + // get secondary gears from fishingOperation (first load from Allegro DB only) if (result.getGear() == null) { - Iterator<Object[]> list = queryList( - "allCruiseGears", - "cruiseId", IntegerType.INSTANCE, Integer.valueOf(id)); - - List<Gear> gears = Lists.newArrayList(); - while (list.hasNext()) { - Object[] gearRow = list.next(); - Gear target = referentielService.getGear((Integer)gearRow[0]); - gears.add(target); - } - result.setGear(gears); + Iterator<Object[]> list = queryList( + "allCruiseGears", + "cruiseId", IntegerType.INSTANCE, Integer.valueOf(id)); + + List<Gear> gears = Lists.newArrayList(); + while (list.hasNext()) { + Object[] gearRow = list.next(); + Gear target = referentielService.getGear((Integer) gearRow[0]); + gears.add(target); + } + result.setGear(gears); } return result; } - @Transactional(readOnly = false) @Override public Cruise createCruise(Cruise bean) { ScientificCruise scientificCruise = ScientificCruise.Factory.newInstance(); @@ -245,19 +236,18 @@ return bean; } - @Transactional(readOnly = false) @Override public Cruise saveCruise(Cruise bean) { - if (bean.getId() == null || bean.getId().isEmpty()) { - throw new IllegalArgumentException("Cruise 'id' must not be null or empty to be saved."); - } - ScientificCruise scientificCruise = scientificCruiseDao.load(Integer.valueOf(bean.getId())); - if (scientificCruise == null) { - throw new DataRetrievalFailureException("Could not retrieve cruise with id=" + bean.getId()); - } - - cruiseToEntity(bean, scientificCruise, true); - return bean; + if (bean.getId() == null || bean.getId().isEmpty()) { + throw new IllegalArgumentException("Cruise 'id' must not be null or empty to be saved."); + } + ScientificCruise scientificCruise = scientificCruiseDao.load(Integer.valueOf(bean.getId())); + if (scientificCruise == null) { + throw new DataRetrievalFailureException("Could not retrieve cruise with id=" + bean.getId()); + } + + cruiseToEntity(bean, scientificCruise, true); + return bean; } protected void cruiseToEntity(Cruise source, ScientificCruise target, boolean copyIfNull) { @@ -368,8 +358,7 @@ target.getFishingTrips().add(fishingTrip); fishingTrip.setScientificCruise(target); } - } - else { + } else { fishingTrip = target.getFishingTrips().iterator().next(); } Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-01-16 22:43:39 UTC (rev 212) @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -37,7 +36,6 @@ * @since 0.3 */ @Service("fishingOperationPersistenceService") -@Transactional(readOnly = true) public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceService implements FishingOperationPersistenceService { /** Logger. */ Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceServiceImpl.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceServiceImpl.java 2013-01-16 22:43:39 UTC (rev 212) @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -37,7 +36,6 @@ * @since 0.3 */ @Service("macroWasteBatchPersistenceService") -@Transactional(readOnly = true) public class MacroWasteBatchPersistenceServiceImpl extends AbstractPersistenceService implements MacroWasteBatchPersistenceService { /** Logger. */ Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java 2013-01-16 22:43:39 UTC (rev 212) @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -37,7 +36,6 @@ * @since 0.3 */ @Service("planktonBatchPersistenceService") -@Transactional(readOnly = true) public class PlanktonBatchPersistenceServiceImpl extends AbstractPersistenceService implements PlanktonBatchPersistenceService { /** Logger. */ Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java 2013-01-16 22:43:39 UTC (rev 212) @@ -31,7 +31,6 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.type.StringType; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.Iterator; import java.util.List; @@ -41,7 +40,6 @@ * @since 0.3 */ @Service("programPersistenceService") -@Transactional(readOnly = true) public class ProgramPersistenceServiceImpl extends AbstractPersistenceService implements ProgramPersistenceService { /** Logger. */ Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2013-01-16 22:43:39 UTC (rev 212) @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -37,7 +36,6 @@ * @since 0.3 */ @Service("protocolPersistenceService") -@Transactional(readOnly = true) public class ProtocolPersistenceServiceImpl extends AbstractPersistenceService implements ProtocolPersistenceService { /** Logger. */ Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-01-16 22:43:39 UTC (rev 212) @@ -46,7 +46,6 @@ import org.hibernate.type.IntegerType; import org.hibernate.type.StringType; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Date; @@ -61,7 +60,6 @@ * @since 0.3 */ @Service("referentialPersistenceService") -@Transactional(readOnly = true) public class ReferentialPersistenceServiceImpl extends AbstractPersistenceService implements ReferentialPersistenceService { /** Logger. */ @@ -151,8 +149,8 @@ @Override public Vessel getVessel(String vesselCode) { - // Warning : return a list because more than one line could be found, - // but 'order by' assume that the first one in the good row + // Warning : return a list because more than one line could be found, + // but 'order by' assume that the first one in the good row Iterator<Object[]> source = queryListWithStatus( "vessel", "vesselCode", StringType.INSTANCE, vesselCode, Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-01-16 22:43:39 UTC (rev 212) @@ -29,7 +29,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -38,7 +37,6 @@ * @since 0.3 */ @Service("speciesBatchPersistenceService") -@Transactional(readOnly = true) public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceService implements SpeciesBatchPersistenceService { /** Logger. */ Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java 2013-01-16 22:43:39 UTC (rev 212) @@ -36,7 +36,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Test; import java.util.Calendar; @@ -174,19 +173,19 @@ @Test public void saveCruise(/*Cruise bean*/) { - Cruise cruise = service.getCruise(dbResource.getFixtures().cruiseId()); - - cruise.setId(null); - cruise = service.createCruise(cruise); - - cruise.setName("unit-TEST"); + Cruise cruise = service.getCruise(dbResource.getFixtures().cruiseId()); - Cruise savedCruise = service.saveCruise(cruise); - assertNotNull(savedCruise); - assertEquals(cruise.getId(), savedCruise.getId()); - assertEquals(cruise.getName(), savedCruise.getName()); - assertEquals(cruise.getComment(), savedCruise.getComment()); - assertNotNull(cruise.getGear()); - assertEquals(cruise.getGear().size(), savedCruise.getGear().size()); + cruise.setId(null); + cruise = service.createCruise(cruise); + + cruise.setName("unit-TEST"); + + Cruise savedCruise = service.saveCruise(cruise); + assertNotNull(savedCruise); + assertEquals(cruise.getId(), savedCruise.getId()); + assertEquals(cruise.getName(), savedCruise.getName()); + assertEquals(cruise.getComment(), savedCruise.getComment()); + assertNotNull(cruise.getGear()); + assertEquals(cruise.getGear().size(), savedCruise.getGear().size()); } } Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceTest.java 2013-01-15 17:31:39 UTC (rev 211) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceTest.java 2013-01-16 22:43:39 UTC (rev 212) @@ -25,7 +25,6 @@ */ import fr.ifremer.tutti.persistence.DatabaseResource; -import fr.ifremer.tutti.persistence.entities.data.Program; import org.junit.Before; import org.junit.ClassRule; import org.junit.Ignore;