Author: tchemit Date: 2013-05-11 17:08:49 +0200 (Sat, 11 May 2013) New Revision: 934 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/934 Log: - refs #2410: [TRAIT] Pas d'arbre d'?\195?\169chantillonnage associ?\195?\169 ?\195?\160 une op?\195?\169ration de p?\195?\170che - improve attachment api javadoc Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.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-05-08 16:06:49 UTC (rev 933) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-05-11 15:08:49 UTC (rev 934) @@ -312,9 +312,10 @@ /** * Get all attachments for the given object {@code objectId} of type. * - * @param objectType type of attachment + * @param objectType type of attachment (see {@link AttachementObjectTypeEnum}) * @param objectId id of the object * @return list of all attachments for the given {@code objectId}. + * @see AttachementObjectTypeEnum */ List<Attachment> getAllAttachments(AttachementObjectTypeEnum objectType, Integer objectId); @@ -447,6 +448,15 @@ //------------------------------------------------------------------------// /** + * @param operationId id of the fishing operation + * @return {@code true} if there is a catchBatch for the given fishing + * operation, {@code false} otherwise. + * @since 2.2 + */ + + boolean isFishingOperationWithCatchBatch(String operationId); + + /** * Get the catchBatch from the fishing Operation id. * <p/> * If batch model is not compatible with Tutti then a 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-05-08 16:06:49 UTC (rev 933) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-05-11 15:08:49 UTC (rev 934) @@ -69,6 +69,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataRetrievalFailureException; import java.io.File; import java.io.IOException; @@ -592,6 +593,18 @@ //------------------------------------------------------------------------// @Override + public boolean isFishingOperationWithCatchBatch(String operationId) { + boolean result; + try { + catchBatchService.getCatchBatchFromFishingOperation(operationId); + result = true; + } catch (DataRetrievalFailureException e) { + result = false; + } + return result; + } + + @Override public CatchBatch getCatchBatchFromFishingOperation(String id) throws InvalidBatchModelException { return catchBatchService.getCatchBatchFromFishingOperation(id); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-05-08 16:06:49 UTC (rev 933) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-05-11 15:08:49 UTC (rev 934) @@ -397,6 +397,11 @@ } @Override + public boolean isFishingOperationWithCatchBatch(String operationId) { + throw notImplemented(); + } + + @Override public CatchBatch getCatchBatchFromFishingOperation(String id) { throw notImplemented(); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java 2013-05-08 16:06:49 UTC (rev 933) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java 2013-05-11 15:08:49 UTC (rev 934) @@ -41,10 +41,19 @@ */ public enum AttachementObjectTypeEnum implements TuttiEnumerationFile.TuttiEnumerable<String> { + /** For cruise only. */ SCIENTIFIC_CRUISE("OBJECT_TYPE_SCIENTIFIC_CRUISE"), + + /** For {@link FishingOperation} only. */ OPERATION("OBJECT_TYPE_OPERATION"), + + /** For {@link CatchBatch} only. */ CATCH_BATCH("OBJECT_TYPE_CATCH_BATCH"), + + /** For batch only ({@link SpeciesBatch} / {@link BenthosBatch} / {@link MarineLitterBatch}). */ BATCH("OBJECT_TYPE_BATCH"), + + /** For sample only ({@link AccidentalBatch} / {@link IndividualObservationBatch}).. */ SAMPLE("OBJECT_TYPE_SAMPLE"); private final String fieldName; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java 2013-05-08 16:06:49 UTC (rev 933) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java 2013-05-11 15:08:49 UTC (rev 934) @@ -44,8 +44,10 @@ /** * Get all attachments for the given object {@code objectId}. * - * @param objectId id of the object + * @param objectType type of object. + * @param objectId id of the object * @return list of all attachments for the given {@code objectId}. + * (see {@link AttachementObjectTypeEnum}) */ List<Attachment> getAllAttachments(AttachementObjectTypeEnum objectType, Integer objectId); @@ -91,7 +93,7 @@ * Deletes all attachments of the given object ids. * * @param objectType type of attachment - * @param objectIds ids of object + * @param objectIds ids of object */ @Transactional(readOnly = false) void deleteAllAttachment(AttachementObjectTypeEnum objectType, Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-05-08 16:06:49 UTC (rev 933) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-05-11 15:08:49 UTC (rev 934) @@ -688,6 +688,11 @@ //------------------------------------------------------------------------// @Override + public boolean isFishingOperationWithCatchBatch(String operationId) { + return driver.isFishingOperationWithCatchBatch(operationId); + } + + @Override public CatchBatch getCatchBatchFromFishingOperation(String id) throws InvalidBatchModelException { return driver.getCatchBatchFromFishingOperation(id);