This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository tutti. See http://git.codelutin.com/tutti.git commit 4a15f520b972f22c68bc8e3a9a7496abbb1150df Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 21 08:08:17 2015 +0100 Suppression de la méthode loadForRead (vu qu'elle n'a plus de raison d'être si les referenceSets sont gérés au niveau de l'application) + renommage de loadForEdit en loadFrom + réorganisation des méthodes --- .../service/longline/ActivityLongLineEncouterService.java | 5 +---- .../longline/ActivityLongLineSensorUsedService.java | 5 +---- .../service/longline/ActivityLonglineService.java | 15 ++++++--------- .../services/service/longline/BranchlineService.java | 5 +---- .../service/longline/SetLonglineCatchService.java | 5 +---- .../longline/SetLonglineDetailCompositionService.java | 5 +---- .../longline/SetLonglineGlobalCompositionService.java | 5 +---- .../services/service/longline/SetLonglineService.java | 9 +++------ .../ird/observe/services/service/longline/TdrService.java | 5 +---- .../service/longline/TripLonglineGearUseService.java | 5 +---- .../services/service/longline/TripLonglineService.java | 11 ++++------- .../service/seine/ActivitySeineObservedSystemService.java | 5 +---- .../services/service/seine/ActivitySeineService.java | 9 +++------ .../services/service/seine/FloatingObjectService.java | 9 +++------ .../services/service/seine/NonTargetCatchService.java | 5 +---- .../services/service/seine/NonTargetSampleService.java | 5 +---- .../service/seine/ObjectObservedSpeciesService.java | 5 +---- .../service/seine/ObjectSchoolEstimateService.java | 5 +---- .../ird/observe/services/service/seine/RouteService.java | 9 +++------ .../services/service/seine/SchoolEstimateService.java | 5 +---- .../observe/services/service/seine/SetSeineService.java | 9 +++------ .../services/service/seine/TargetCatchService.java | 5 +---- .../services/service/seine/TargetSampleService.java | 5 +---- .../service/seine/TransmittingBuoyOperationService.java | 5 +---- .../services/service/seine/TripSeineGearUseService.java | 5 +---- .../observe/services/service/seine/TripSeineService.java | 2 +- 26 files changed, 44 insertions(+), 119 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java index a47b8a0..1fb7ecb 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java @@ -37,10 +37,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface ActivityLongLineEncouterService extends ObserveService { @ReadDataPermission - FormDto<ActivityLonglineEncouterDto> loadToRead(String activityLonglineId); - - @WriteDataPermission - FormDto<ActivityLonglineEncouterDto> loadToEdit(String activityLonglineId); + FormDto<ActivityLonglineEncouterDto> loadForm(String activityLonglineId); @WriteDataPermission @Write diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java index 643754b..223e3b8 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java @@ -37,10 +37,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface ActivityLongLineSensorUsedService extends ObserveService { @ReadDataPermission - FormDto<ActivityLonglineSensorUsedDto> loadToRead(String activityLonglineId); - - @WriteDataPermission - FormDto<ActivityLonglineSensorUsedDto> loadToEdit(String activityLonglineId); + FormDto<ActivityLonglineSensorUsedDto> loadForm(String activityLonglineId); @WriteDataPermission @Write diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java index b3a7093..c8d5776 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java @@ -48,21 +48,18 @@ public interface ActivityLonglineService extends ObserveService { int getActivityLonglinePositionInTripLongline(String tripLonglineId, String activityLonglineId); @ReadDataPermission - FormDto<ActivityLonglineDto> loadToRead(String activityLonglineId); + FormDto<ActivityLonglineDto> loadForm(String activityLonglineId); @ReadDataPermission - ReferenceDto<ActivityLonglineDto> loadReferenceToRead(String activityLonglineId); + ActivityLonglineDto loadDto(String activityLonglineId); @ReadDataPermission - ActivityLonglineDto loadDto(String activityLonglineId); + ReferenceDto<ActivityLonglineDto> loadReferenceToRead(String activityLonglineId); @ReadDataPermission boolean exists(String activityLonglineId); @WriteDataPermission - FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId); - - @WriteDataPermission FormDto<ActivityLonglineDto> preCreate(String tripLonglineId); @Write @@ -70,12 +67,12 @@ public interface ActivityLonglineService extends ObserveService { @PostRequest TripChildSaveResultDto save(String tripLonglineId, ActivityLonglineDto dto); - @Write - @WriteDataPermission - @DeleteRequest /** * @return true if the trip end date has been updated */ + @Write + @WriteDataPermission + @DeleteRequest boolean delete(String tripLonglineId, String activityLonglineId); @Write diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java index 279f5c2..f3e5f1b 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/BranchlineService.java @@ -14,10 +14,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface BranchlineService extends ObserveService { @ReadDataPermission - FormDto<BranchlineDto> loadToRead(String branchlineId); - - @WriteDataPermission - FormDto<BranchlineDto> loadToEdit(String branchlineId); + FormDto<BranchlineDto> loadForm(String branchlineId); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java index c6883aa..5558aa6 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java @@ -37,10 +37,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface SetLonglineCatchService extends ObserveService { @ReadDataPermission - FormDto<SetLonglineCatchDto> loadToRead(String setLonglineId); - - @WriteDataPermission - FormDto<SetLonglineCatchDto> loadToEdit(String setLonglineId); + FormDto<SetLonglineCatchDto> loadForm(String setLonglineId); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java index 07b3cb2..40d41e8 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java @@ -37,10 +37,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface SetLonglineDetailCompositionService extends ObserveService { @ReadDataPermission - FormDto<SetLonglineDetailCompositionDto> loadToRead(String setLonglineId); - - @WriteDataPermission - FormDto<SetLonglineDetailCompositionDto> loadToEdit(String setLonglineId); + FormDto<SetLonglineDetailCompositionDto> loadForm(String setLonglineId); @WriteDataPermission boolean canDeleteSection(String sectionId); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java index f6c9fc7..29d5536 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java @@ -37,10 +37,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface SetLonglineGlobalCompositionService extends ObserveService { @ReadDataPermission - FormDto<SetLonglineGlobalCompositionDto> loadToRead(String setLonglineId); - - @WriteDataPermission - FormDto<SetLonglineGlobalCompositionDto> loadToEdit(String setLonglineId); + FormDto<SetLonglineGlobalCompositionDto> loadForm(String setLonglineId); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java index 9e97abe..3e8ada7 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java @@ -39,21 +39,18 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface SetLonglineService extends ObserveService { @ReadDataPermission - FormDto<SetLonglineDto> loadToRead(String setLonglineId); + FormDto<SetLonglineDto> loadForm(String setLonglineId); @ReadDataPermission - ReferenceDto<SetLonglineDto> loadReferenceToRead(String setLonglineId); + SetLonglineDto loadDto(String setLonglineId); @ReadDataPermission - SetLonglineDto loadDto(String setLonglineId); + ReferenceDto<SetLonglineDto> loadReferenceToRead(String setLonglineId); @ReadDataPermission boolean exists(String setLonglineId); @WriteDataPermission - FormDto<SetLonglineDto> loadToEdit(String setLonglineId); - - @WriteDataPermission FormDto<SetLonglineDto> preCreate(String activityLonglineId); @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java index 3b82d60..1004972 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java @@ -37,10 +37,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface TdrService extends ObserveService { @ReadDataPermission - FormDto<SetLonglineTdrDto> loadToRead(String setLonglineId); - - @WriteDataPermission - FormDto<SetLonglineTdrDto> loadToEdit(String setLonglineId); + FormDto<SetLonglineTdrDto> loadForm(String setLonglineId); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java index a87d49d..8f5f633 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseService.java @@ -37,10 +37,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface TripLonglineGearUseService extends ObserveService { @ReadDataPermission - FormDto<TripLonglineGearUseDto> loadToRead(String tripLonglineId); - - @WriteDataPermission - FormDto<TripLonglineGearUseDto> loadToEdit(String tripLonglineId); + FormDto<TripLonglineGearUseDto> loadForm(String tripLonglineId); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java index 3c5e492..2bd6ab6 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java @@ -49,16 +49,16 @@ public interface TripLonglineService extends ObserveService { ReferenceSetDto<TripLonglineDto> getTripLonglineByProgram(String programId); @ReadDataPermission - TripLonglineDto loadDto(String tripLonglineId); - - @ReadDataPermission int getTripLonglinePositionInProgram(String programId, String tripLonglineId); @ReadDataPermission TripMapDto getTripLonglineMap(String tripLonglineId); @ReadDataPermission - FormDto<TripLonglineDto> loadToRead(String tripLonglineId); + FormDto<TripLonglineDto> loadForm(String tripLonglineId); + + @ReadDataPermission + TripLonglineDto loadDto(String tripLonglineId); @ReadDataPermission ReferenceDto<TripLonglineDto> loadReferenceToRead(String tripLonglineId); @@ -67,9 +67,6 @@ public interface TripLonglineService extends ObserveService { boolean exists(String tripLonglineId); @WriteDataPermission - FormDto<TripLonglineDto> loadToEdit(String tripLonglineId); - - @WriteDataPermission FormDto<TripLonglineDto> preCreate(String programId); @Write diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java index 77c8d83..b053d46 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java @@ -37,10 +37,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface ActivitySeineObservedSystemService extends ObserveService { @ReadDataPermission - FormDto<ActivitySeineObservedSystemDto> loadToRead(String activitySeineId); - - @WriteDataPermission - FormDto<ActivitySeineObservedSystemDto> loadToEdit(String activitySeineId); + FormDto<ActivitySeineObservedSystemDto> loadForm(String activitySeineId); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java index 0acb68a..c6414b2 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java @@ -48,21 +48,18 @@ public interface ActivitySeineService extends ObserveService { int getActivitySeinePositionInRoute(String routeId, String activitySeineId); @ReadDataPermission - FormDto<ActivitySeineDto> loadToRead(String activitySeineId); + FormDto<ActivitySeineDto> loadForm(String activitySeineId); @ReadDataPermission - ReferenceDto<ActivitySeineDto> loadReferenceToRead(String activitySeineId); + ActivitySeineDto loadDto(String activitySeineId); @ReadDataPermission - ActivitySeineDto loadDto(String activitySeineId); + ReferenceDto<ActivitySeineDto> loadReferenceToRead(String activitySeineId); @ReadDataPermission boolean exists(String activitySeineId); @WriteDataPermission - FormDto<ActivitySeineDto> loadToEdit(String activitySeineId); - - @WriteDataPermission FormDto<ActivitySeineDto> preCreate(String routeId); @Write diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java index 7c473ea..4b105b6 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java @@ -42,21 +42,18 @@ public interface FloatingObjectService extends ObserveService { ReferenceSetDto<FloatingObjectDto> getFloatingObjectByActivitySeine(String activitySeineId); @ReadDataPermission - FormDto<FloatingObjectDto> loadToRead(String floatingObjectId); + FormDto<FloatingObjectDto> loadForm(String floatingObjectId); @ReadDataPermission - ReferenceDto<FloatingObjectDto> loadReferenceToRead(String floatingObjectId); + FloatingObjectDto loadDto(String floatingObjectId); @ReadDataPermission - FloatingObjectDto loadDto(String floatingObjectId); + ReferenceDto<FloatingObjectDto> loadReferenceToRead(String floatingObjectId); @ReadDataPermission boolean exists(String floatingObjectId); @WriteDataPermission - FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId); - - @WriteDataPermission FormDto<FloatingObjectDto> preCreate(String activitySeineId); @Write diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java index 2bbb108..54fd2e7 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java @@ -37,10 +37,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface NonTargetCatchService extends ObserveService { @ReadDataPermission - FormDto<SetSeineNonTargetCatchDto> loadToRead(String setSeineId); - - @WriteDataPermission - FormDto<SetSeineNonTargetCatchDto> loadToEdit(String setSeineId, String tripSeineId); + FormDto<SetSeineNonTargetCatchDto> loadForm(String setSeineId, String tripSeineId); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java index 68a0e73..906e25b 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java @@ -39,10 +39,7 @@ public interface NonTargetSampleService extends ObserveService { boolean canUseNonTargetSample(String setSeineId); @ReadDataPermission - FormDto<NonTargetSampleDto> loadToRead(String setSeineId); - - @WriteDataPermission - FormDto<NonTargetSampleDto> loadToEdit(String setSeineId); + FormDto<NonTargetSampleDto> loadForm(String setSeineId); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java index 09da991..6ecd5ad 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java @@ -36,10 +36,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface ObjectObservedSpeciesService extends ObserveService { @ReadDataPermission - FormDto<FloatingObjectObservedSpeciesDto> loadToRead(String floatingObjectId); - - @WriteDataPermission - FormDto<FloatingObjectObservedSpeciesDto> loadToEdit(String floatingObjectId); + FormDto<FloatingObjectObservedSpeciesDto> loadForm(String floatingObjectId); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java index 73b9117..dcc0d1c 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java @@ -36,10 +36,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface ObjectSchoolEstimateService extends ObserveService { @ReadDataPermission - FormDto<FloatingObjectSchoolEstimateDto> loadToRead(String floatingObjectId); - - @WriteDataPermission - FormDto<FloatingObjectSchoolEstimateDto> loadToEdit(String floatingObjectId); + FormDto<FloatingObjectSchoolEstimateDto> loadForm(String floatingObjectId); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java index 9d4d151..107dc9f 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java @@ -48,21 +48,18 @@ public interface RouteService extends ObserveService { int getRoutePositionInTripSeine(String tripSeineId, String routeId); @ReadDataPermission - FormDto<RouteDto> loadToRead(String routeId); + FormDto<RouteDto> loadForm(String routeId); @ReadDataPermission - ReferenceDto<RouteDto> loadReferenceToRead(String routeId); + RouteDto loadDto(String routeId); @ReadDataPermission - RouteDto loadDto(String routeId); + ReferenceDto<RouteDto> loadReferenceToRead(String routeId); @ReadDataPermission boolean exists(String routeId); @WriteDataPermission - FormDto<RouteDto> loadToEdit(String routeId); - - @WriteDataPermission FormDto<RouteDto> preCreate(String tripSeineId); @Write diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java index f384280..f403330 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java @@ -36,10 +36,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface SchoolEstimateService extends ObserveService { @ReadDataPermission - FormDto<SetSeineSchoolEstimateDto> loadToRead(String setSeineId); - - @WriteDataPermission - FormDto<SetSeineSchoolEstimateDto> loadToEdit(String setSeineId, String tripSeineId); + FormDto<SetSeineSchoolEstimateDto> loadForm(String setSeineId, String tripSeineId); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java index 456ed6a..a4b2a74 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java @@ -38,21 +38,18 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface SetSeineService extends ObserveService { @ReadDataPermission - FormDto<SetSeineDto> loadToRead(String setSeineId); + FormDto<SetSeineDto> loadForm(String setSeineId); @ReadDataPermission - ReferenceDto<SetSeineDto> loadReferenceToRead(String setSeineId); + SetSeineDto loadDto(String setSeineId); @ReadDataPermission - SetSeineDto loadDto(String setSeineId); + ReferenceDto<SetSeineDto> loadReferenceToRead(String setSeineId); @ReadDataPermission boolean exists(String setSeineId); @WriteDataPermission - FormDto<SetSeineDto> loadToEdit(String setSeineId); - - @WriteDataPermission FormDto<SetSeineDto> preCreate(String routeId, String activitySeineId); @Write diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java index 850339a..e67d627 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java @@ -37,10 +37,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface TargetCatchService extends ObserveService { @ReadDataPermission - FormDto<SetSeineTargetCatchDto> loadToRead(String setSeineId, boolean discarded); - - @WriteDataPermission - FormDto<SetSeineTargetCatchDto> loadToEdit(String setSeineId, boolean discarded, String tripSeineId); + FormDto<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded, String tripSeineId); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java index da9815f..6a2a237 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java @@ -40,10 +40,7 @@ public interface TargetSampleService extends ObserveService { boolean canUseTargetSample(String setSeineId, boolean discarded); @ReadDataPermission - FormDto<TargetSampleDto> loadToRead(String setSeineId, boolean discarded); - - @WriteDataPermission - FormDto<TargetSampleDto> loadToEdit(String setSeineId, boolean discarded); + FormDto<TargetSampleDto> loadForm(String setSeineId, boolean discarded); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java index 72987d9..b74cefd 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java @@ -36,10 +36,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface TransmittingBuoyOperationService extends ObserveService { @ReadDataPermission - FormDto<FloatingObjectTransmittingBuoyDto> loadToRead(String floatingObjectId); - - @WriteDataPermission - FormDto<FloatingObjectTransmittingBuoyDto> loadToEdit(String floatingObjectId); + FormDto<FloatingObjectTransmittingBuoyDto> loadForm(String floatingObjectId); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java index 741df06..3f6a426 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseService.java @@ -37,10 +37,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface TripSeineGearUseService extends ObserveService { @ReadDataPermission - FormDto<TripSeineGearUseDto> loadToRead(String tripSeineId); - - @WriteDataPermission - FormDto<TripSeineGearUseDto> loadToEdit(String tripSeineId); + FormDto<TripSeineGearUseDto> loadForm(String tripSeineId); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java index 6d4856e..c03dc60 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java @@ -54,7 +54,7 @@ public interface TripSeineService extends ObserveService { @ReadDataPermission TripMapDto getTripSeineMap(String tripSeineId); - @WriteDataPermission + @ReadDataPermission FormDto<TripSeineDto> loadForm(String tripSeineId); @ReadDataPermission -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.