Author: tchemit Date: 2013-05-12 21:56:50 +0200 (Sun, 12 May 2013) New Revision: 936 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/936 Log: use isFishingOperationWithCatchBatch method Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 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-11 15:53:26 UTC (rev 935) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-05-12 19:56:50 UTC (rev 936) @@ -69,7 +69,6 @@ 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; @@ -594,14 +593,7 @@ @Override public boolean isFishingOperationWithCatchBatch(String operationId) { - boolean result; - try { - catchBatchService.getCatchBatchFromFishingOperation(operationId); - result = true; - } catch (DataRetrievalFailureException e) { - result = false; - } - return result; + return catchBatchService.isFishingOperationWithCatchBatch(operationId); } @Override Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceService.java 2013-05-11 15:53:26 UTC (rev 935) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceService.java 2013-05-12 19:56:50 UTC (rev 936) @@ -36,6 +36,14 @@ //------------------------------------------------------------------------// /** + * @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. * * @param fishingOperationId id of the fishing operation Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2013-05-11 15:53:26 UTC (rev 935) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2013-05-12 19:56:50 UTC (rev 936) @@ -71,6 +71,14 @@ //------------------------------------------------------------------------// @Override + public boolean isFishingOperationWithCatchBatch(String operationId) { + Preconditions.checkNotNull(operationId); + boolean result = batchHelper.isCatchBatchExistsForFishingOperation( + Integer.valueOf(operationId)); + return result; + } + + @Override public CatchBatch getCatchBatchFromFishingOperation(String fishingOperationId) { Preconditions.checkNotNull(fishingOperationId); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2013-05-11 15:53:26 UTC (rev 935) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2013-05-12 19:56:50 UTC (rev 936) @@ -77,8 +77,6 @@ private static final Log log = LogFactory.getLog(BatchPersistenceHelper.class); - public static final String BATCH_PMFM_ID = "pmfmId"; - @Resource(name = "referentialPersistenceService") protected ReferentialPersistenceService referentialService; @@ -242,6 +240,10 @@ return result; } + public boolean isCatchBatchExistsForFishingOperation(Integer fishingOperationId) { + return catchBatchDao.isCatchBatchExistsForFishingOperation(fishingOperationId); + } + public Integer getCatchBatchIdByFishingOperationId(Integer fishingOperationId) throws DataRetrievalFailureException { return catchBatchDao.getIdByFishingOperationId(fishingOperationId); } @@ -497,7 +499,7 @@ for (int i = 0; i < nbParams; i++) { Integer sortingPmfmId = ids[2 * i]; Integer sortingQualitativeValueId = ids[2 * i + 1]; - params[3 * i] = BatchPersistenceHelper.BATCH_PMFM_ID; + params[3 * i] = CatchBatchExtendDao.PMFM_ID; params[3 * i + 1] = sortingPmfmId; params[3 * i + 2] = sortingQualitativeValueId; }