[Observe-commits] 06/11: Impact du changement de l'API des services sur l'implatantion webmotion

This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit c91d3def72ba089198fb3070bf76ac3bf7e953ba Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 21 08:14:20 2015 +0100 Impact du changement de l'API des services sur l'implatantion webmotion --- .../ActivityLongLineEncouterServiceController.java | 9 ++------- .../ActivityLongLineSensorUsedServiceController.java | 9 ++------- .../longline/ActivityLonglineServiceController.java | 17 ++++++----------- .../v1/longline/BranchlineServiceController.java | 9 ++------- .../longline/SetLonglineCatchServiceController.java | 9 ++------- ...SetLonglineDetailCompositionServiceController.java | 9 ++------- ...SetLonglineGlobalCompositionServiceController.java | 9 ++------- .../v1/longline/SetLonglineServiceController.java | 17 ++++++----------- .../controller/v1/longline/TdrServiceController.java | 9 ++------- .../TripLonglineGearUseServiceController.java | 9 ++------- .../v1/longline/TripLonglineServiceController.java | 19 +++++++------------ .../ActivitySeineObservedSystemServiceController.java | 9 ++------- .../v1/seine/ActivitySeineServiceController.java | 17 ++++++----------- .../v1/seine/FloatingObjectServiceController.java | 17 ++++++----------- .../v1/seine/NonTargetCatchServiceController.java | 9 ++------- .../v1/seine/NonTargetSampleServiceController.java | 9 ++------- .../seine/ObjectObservedSpeciesServiceController.java | 9 ++------- .../seine/ObjectSchoolEstimateServiceController.java | 9 ++------- .../controller/v1/seine/RouteServiceController.java | 17 ++++++----------- .../v1/seine/SchoolEstimateServiceController.java | 9 ++------- .../v1/seine/SetSeineServiceController.java | 17 ++++++----------- .../v1/seine/TargetCatchServiceController.java | 9 ++------- .../v1/seine/TargetSampleServiceController.java | 9 ++------- .../TransmittingBuoyOperationServiceController.java | 9 ++------- .../v1/seine/TripSeineGearUseServiceController.java | 9 ++------- .../v1/seine/TripSeineServiceController.java | 18 +++++++++--------- 26 files changed, 88 insertions(+), 213 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncouterServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncouterServiceController.java index 6230410..cda5cd4 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncouterServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncouterServiceController.java @@ -38,13 +38,8 @@ public class ActivityLongLineEncouterServiceController extends ObserveAuthentica } @Override - public FormDto<ActivityLonglineEncouterDto> loadToRead(String activityLonglineId) { - return service.loadToRead(activityLonglineId); - } - - @Override - public FormDto<ActivityLonglineEncouterDto> loadToEdit(String activityLonglineId) { - return service.loadToEdit(activityLonglineId); + public FormDto<ActivityLonglineEncouterDto> loadForm(String activityLonglineId) { + return service.loadForm(activityLonglineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java index 9ac9b71..95bf586 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java @@ -38,13 +38,8 @@ public class ActivityLongLineSensorUsedServiceController extends ObserveAuthenti } @Override - public FormDto<ActivityLonglineSensorUsedDto> loadToRead(String activityLonglineId) { - return service.loadToRead(activityLonglineId); - } - - @Override - public FormDto<ActivityLonglineSensorUsedDto> loadToEdit(String activityLonglineId) { - return service.loadToEdit(activityLonglineId); + public FormDto<ActivityLonglineSensorUsedDto> loadForm(String activityLonglineId) { + return service.loadForm(activityLonglineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java index 078ba79..cd4466d 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java @@ -52,13 +52,8 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override - public FormDto<ActivityLonglineDto> loadToRead(String activityLonglineId) { - return service.loadToRead(activityLonglineId); - } - - @Override - public ReferenceDto<ActivityLonglineDto> loadReferenceToRead(String activityLonglineId) { - return service.loadReferenceToRead(activityLonglineId); + public FormDto<ActivityLonglineDto> loadForm(String activityLonglineId) { + return service.loadForm(activityLonglineId); } @Override @@ -67,13 +62,13 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override - public boolean exists(String activityLonglineId) { - return service.exists(activityLonglineId); + public ReferenceDto<ActivityLonglineDto> loadReferenceToRead(String activityLonglineId) { + return service.loadReferenceToRead(activityLonglineId); } @Override - public FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId) { - return service.loadToEdit(activityLonglineId); + public boolean exists(String activityLonglineId) { + return service.exists(activityLonglineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/BranchlineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/BranchlineServiceController.java index 908a632..ce38864 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/BranchlineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/BranchlineServiceController.java @@ -15,13 +15,8 @@ public class BranchlineServiceController extends ObserveAuthenticatedServiceCont } @Override - public FormDto<BranchlineDto> loadToRead(String branchlineId) { - return service.loadToRead(branchlineId); - } - - @Override - public FormDto<BranchlineDto> loadToEdit(String branchlineId) { - return service.loadToEdit(branchlineId); + public FormDto<BranchlineDto> loadForm(String branchlineId) { + return service.loadForm(branchlineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineCatchServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineCatchServiceController.java index 2965c8f..8ed0131 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineCatchServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineCatchServiceController.java @@ -38,13 +38,8 @@ public class SetLonglineCatchServiceController extends ObserveAuthenticatedServi } @Override - public FormDto<SetLonglineCatchDto> loadToRead(String setLonglineId) { - return service.loadToRead(setLonglineId); - } - - @Override - public FormDto<SetLonglineCatchDto> loadToEdit(String setLonglineId) { - return service.loadToEdit(setLonglineId); + public FormDto<SetLonglineCatchDto> loadForm(String setLonglineId) { + return service.loadForm(setLonglineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineDetailCompositionServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineDetailCompositionServiceController.java index a34ad18..15b43ec 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineDetailCompositionServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineDetailCompositionServiceController.java @@ -38,13 +38,8 @@ public class SetLonglineDetailCompositionServiceController extends ObserveAuthen } @Override - public FormDto<SetLonglineDetailCompositionDto> loadToRead(String setLonglineId) { - return service.loadToRead(setLonglineId); - } - - @Override - public FormDto<SetLonglineDetailCompositionDto> loadToEdit(String setLonglineId) { - return service.loadToEdit(setLonglineId); + public FormDto<SetLonglineDetailCompositionDto> loadForm(String setLonglineId) { + return service.loadForm(setLonglineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java index 0addcc9..3fca427 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java @@ -38,13 +38,8 @@ public class SetLonglineGlobalCompositionServiceController extends ObserveAuthen } @Override - public FormDto<SetLonglineGlobalCompositionDto> loadToRead(String setLonglineId) { - return service.loadToRead(setLonglineId); - } - - @Override - public FormDto<SetLonglineGlobalCompositionDto> loadToEdit(String setLonglineId) { - return service.loadToEdit(setLonglineId); + public FormDto<SetLonglineGlobalCompositionDto> loadForm(String setLonglineId) { + return service.loadForm(setLonglineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java index 5e4a29d..8230595 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java @@ -39,13 +39,8 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon } @Override - public FormDto<SetLonglineDto> loadToRead(String setLonglineId) { - return service.loadToRead(setLonglineId); - } - - @Override - public ReferenceDto<SetLonglineDto> loadReferenceToRead(String setLonglineId) { - return service.loadReferenceToRead(setLonglineId); + public FormDto<SetLonglineDto> loadForm(String setLonglineId) { + return service.loadForm(setLonglineId); } @Override @@ -54,13 +49,13 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon } @Override - public boolean exists(String setLonglineId) { - return service.exists(setLonglineId); + public ReferenceDto<SetLonglineDto> loadReferenceToRead(String setLonglineId) { + return service.loadReferenceToRead(setLonglineId); } @Override - public FormDto<SetLonglineDto> loadToEdit(String setLonglineId) { - return service.loadToEdit(setLonglineId); + public boolean exists(String setLonglineId) { + return service.exists(setLonglineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TdrServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TdrServiceController.java index 19a4ae1..b63e6cc 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TdrServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TdrServiceController.java @@ -38,13 +38,8 @@ public class TdrServiceController extends ObserveAuthenticatedServiceControllerS } @Override - public FormDto<SetLonglineTdrDto> loadToRead(String setLonglineId) { - return service.loadToRead(setLonglineId); - } - - @Override - public FormDto<SetLonglineTdrDto> loadToEdit(String setLonglineId) { - return service.loadToEdit(setLonglineId); + public FormDto<SetLonglineTdrDto> loadForm(String setLonglineId) { + return service.loadForm(setLonglineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineGearUseServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineGearUseServiceController.java index fd8f77a..7d28e5c 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineGearUseServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineGearUseServiceController.java @@ -38,13 +38,8 @@ public class TripLonglineGearUseServiceController extends ObserveAuthenticatedSe } @Override - public FormDto<TripLonglineGearUseDto> loadToRead(String tripLonglineId) { - return service.loadToRead(tripLonglineId); - } - - @Override - public FormDto<TripLonglineGearUseDto> loadToEdit(String tripLonglineId) { - return service.loadToEdit(tripLonglineId); + public FormDto<TripLonglineGearUseDto> loadForm(String tripLonglineId) { + return service.loadForm(tripLonglineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java index e837d57..17808e3 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java @@ -53,11 +53,6 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public TripLonglineDto loadDto(String tripLonglineId) { - return service.loadDto(tripLonglineId); - } - - @Override public int getTripLonglinePositionInProgram(String programId, String tripLonglineId) { return service.getTripLonglinePositionInProgram(programId, tripLonglineId); } @@ -68,8 +63,13 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public FormDto<TripLonglineDto> loadToRead(String tripLonglineId) { - return service.loadToRead(tripLonglineId); + public FormDto<TripLonglineDto> loadForm(String tripLonglineId) { + return service.loadForm(tripLonglineId); + } + + @Override + public TripLonglineDto loadDto(String tripLonglineId) { + return service.loadDto(tripLonglineId); } @Override @@ -83,11 +83,6 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public FormDto<TripLonglineDto> loadToEdit(String tripLonglineId) { - return service.loadToEdit(tripLonglineId); - } - - @Override public FormDto<TripLonglineDto> preCreate(String programId) { return service.preCreate(programId); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java index 601a5e8..ae3d1ad 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java @@ -38,13 +38,8 @@ public class ActivitySeineObservedSystemServiceController extends ObserveAuthent } @Override - public FormDto<ActivitySeineObservedSystemDto> loadToRead(String activitySeineId) { - return service.loadToRead(activitySeineId); - } - - @Override - public FormDto<ActivitySeineObservedSystemDto> loadToEdit(String activitySeineId) { - return service.loadToEdit(activitySeineId); + public FormDto<ActivitySeineObservedSystemDto> loadForm(String activitySeineId) { + return service.loadForm(activitySeineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java index 0c25098..70ad39d 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java @@ -52,13 +52,8 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override - public FormDto<ActivitySeineDto> loadToRead(String activitySeineId) { - return service.loadToRead(activitySeineId); - } - - @Override - public ReferenceDto<ActivitySeineDto> loadReferenceToRead(String activitySeineId) { - return service.loadReferenceToRead(activitySeineId); + public FormDto<ActivitySeineDto> loadForm(String activitySeineId) { + return service.loadForm(activitySeineId); } @Override @@ -67,13 +62,13 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override - public boolean exists(String activitySeineId) { - return service.exists(activitySeineId); + public ReferenceDto<ActivitySeineDto> loadReferenceToRead(String activitySeineId) { + return service.loadReferenceToRead(activitySeineId); } @Override - public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { - return service.loadToEdit(activitySeineId); + public boolean exists(String activitySeineId) { + return service.exists(activitySeineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java index c4ed148..5f9dcad 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java @@ -44,13 +44,8 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService } @Override - public FormDto<FloatingObjectDto> loadToRead(String floatingObjectId) { - return service.loadToRead(floatingObjectId); - } - - @Override - public ReferenceDto<FloatingObjectDto> loadReferenceToRead(String floatingObjectId) { - return service.loadReferenceToRead(floatingObjectId); + public FormDto<FloatingObjectDto> loadForm(String floatingObjectId) { + return service.loadForm(floatingObjectId); } @Override @@ -59,13 +54,13 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService } @Override - public boolean exists(String floatingObjectId) { - return service.exists(floatingObjectId); + public ReferenceDto<FloatingObjectDto> loadReferenceToRead(String floatingObjectId) { + return service.loadReferenceToRead(floatingObjectId); } @Override - public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { - return service.loadToEdit(floatingObjectId); + public boolean exists(String floatingObjectId) { + return service.exists(floatingObjectId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java index c79da89..5741cfa 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java @@ -38,13 +38,8 @@ public class NonTargetCatchServiceController extends ObserveAuthenticatedService } @Override - public FormDto<SetSeineNonTargetCatchDto> loadToRead(String setSeineId) { - return service.loadToRead(setSeineId); - } - - @Override - public FormDto<SetSeineNonTargetCatchDto> loadToEdit(String setSeineId, String tripSeineId) { - return service.loadToEdit(setSeineId, tripSeineId); + public FormDto<SetSeineNonTargetCatchDto> loadForm(String setSeineId, String tripSeineId) { + return service.loadForm(setSeineId, tripSeineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java index 0efcba4..fda1ecd 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java @@ -42,13 +42,8 @@ public class NonTargetSampleServiceController extends ObserveAuthenticatedServic } @Override - public FormDto<NonTargetSampleDto> loadToRead(String setSeineId) { - return service.loadToRead(setSeineId); - } - - @Override - public FormDto<NonTargetSampleDto> loadToEdit(String setSeineId) { - return service.loadToEdit(setSeineId); + public FormDto<NonTargetSampleDto> loadForm(String setSeineId) { + return service.loadForm(setSeineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java index 0993183..c12d497 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java @@ -37,13 +37,8 @@ public class ObjectObservedSpeciesServiceController extends ObserveAuthenticated } @Override - public FormDto<FloatingObjectObservedSpeciesDto> loadToRead(String floatingObjectId) { - return service.loadToRead(floatingObjectId); - } - - @Override - public FormDto<FloatingObjectObservedSpeciesDto> loadToEdit(String floatingObjectId) { - return service.loadToEdit(floatingObjectId); + public FormDto<FloatingObjectObservedSpeciesDto> loadForm(String floatingObjectId) { + return service.loadForm(floatingObjectId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java index 66e6737..5a4410c 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java @@ -37,13 +37,8 @@ public class ObjectSchoolEstimateServiceController extends ObserveAuthenticatedS } @Override - public FormDto<FloatingObjectSchoolEstimateDto> loadToRead(String floatingObjectId) { - return service.loadToRead(floatingObjectId); - } - - @Override - public FormDto<FloatingObjectSchoolEstimateDto> loadToEdit(String floatingObjectId) { - return service.loadToEdit(floatingObjectId); + public FormDto<FloatingObjectSchoolEstimateDto> loadForm(String floatingObjectId) { + return service.loadForm(floatingObjectId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java index eb8c949..2e1475b 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java @@ -52,13 +52,8 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override - public FormDto<RouteDto> loadToRead(String routeId) { - return service.loadToRead(routeId); - } - - @Override - public ReferenceDto<RouteDto> loadReferenceToRead(String routeId) { - return service.loadReferenceToRead(routeId); + public FormDto<RouteDto> loadForm(String routeId) { + return service.loadForm(routeId); } @Override @@ -67,13 +62,13 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override - public boolean exists(String routeId) { - return service.exists(routeId); + public ReferenceDto<RouteDto> loadReferenceToRead(String routeId) { + return service.loadReferenceToRead(routeId); } @Override - public FormDto<RouteDto> loadToEdit(String routeId) { - return service.loadToEdit(routeId); + public boolean exists(String routeId) { + return service.exists(routeId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java index 8ddbc10..8ddb8fb 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java @@ -37,13 +37,8 @@ public class SchoolEstimateServiceController extends ObserveAuthenticatedService } @Override - public FormDto<SetSeineSchoolEstimateDto> loadToRead(String setSeineId) { - return service.loadToRead(setSeineId); - } - - @Override - public FormDto<SetSeineSchoolEstimateDto> loadToEdit(String setSeineId, String tripSeineId) { - return service.loadToEdit(setSeineId, tripSeineId); + public FormDto<SetSeineSchoolEstimateDto> loadForm(String setSeineId, String tripSeineId) { + return service.loadForm(setSeineId, tripSeineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java index 39e3f11..abdf5c4 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java @@ -38,13 +38,8 @@ public class SetSeineServiceController extends ObserveAuthenticatedServiceContro } @Override - public FormDto<SetSeineDto> loadToRead(String setSeineId) { - return service.loadToRead(setSeineId); - } - - @Override - public ReferenceDto<SetSeineDto> loadReferenceToRead(String setSeineId) { - return service.loadReferenceToRead(setSeineId); + public FormDto<SetSeineDto> loadForm(String setSeineId) { + return service.loadForm(setSeineId); } @Override @@ -53,13 +48,13 @@ public class SetSeineServiceController extends ObserveAuthenticatedServiceContro } @Override - public boolean exists(String setSeineId) { - return service.exists(setSeineId); + public ReferenceDto<SetSeineDto> loadReferenceToRead(String setSeineId) { + return service.loadReferenceToRead(setSeineId); } @Override - public FormDto<SetSeineDto> loadToEdit(String setSeineId) { - return service.loadToEdit(setSeineId); + public boolean exists(String setSeineId) { + return service.exists(setSeineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java index 7a270ef..d49eb00 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java @@ -38,13 +38,8 @@ public class TargetCatchServiceController extends ObserveAuthenticatedServiceCon } @Override - public FormDto<SetSeineTargetCatchDto> loadToRead(String setSeineId, boolean discarded) { - return service.loadToRead(setSeineId, discarded); - } - - @Override - public FormDto<SetSeineTargetCatchDto> loadToEdit(String setSeineId, boolean discarded, String tripSeineId) { - return service.loadToEdit(setSeineId, discarded, tripSeineId); + public FormDto<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded, String tripSeineId) { + return service.loadForm(setSeineId, discarded, tripSeineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java index dd25a10..f425ee5 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java @@ -43,13 +43,8 @@ public class TargetSampleServiceController extends ObserveAuthenticatedServiceCo } @Override - public FormDto<TargetSampleDto> loadToRead(String setSeineId, boolean discarded) { - return service.loadToRead(setSeineId, discarded); - } - - @Override - public FormDto<TargetSampleDto> loadToEdit(String setSeineId, boolean discarded) { - return service.loadToEdit(setSeineId, discarded); + public FormDto<TargetSampleDto> loadForm(String setSeineId, boolean discarded) { + return service.loadForm(setSeineId, discarded); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java index a291d0f..fbc55e8 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java @@ -37,13 +37,8 @@ public class TransmittingBuoyOperationServiceController extends ObserveAuthentic } @Override - public FormDto<FloatingObjectTransmittingBuoyDto> loadToRead(String floatingObjectId) { - return service.loadToRead(floatingObjectId); - } - - @Override - public FormDto<FloatingObjectTransmittingBuoyDto> loadToEdit(String floatingObjectId) { - return service.loadToEdit(floatingObjectId); + public FormDto<FloatingObjectTransmittingBuoyDto> loadForm(String floatingObjectId) { + return service.loadForm(floatingObjectId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineGearUseServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineGearUseServiceController.java index ec4871a..e31c6ff 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineGearUseServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineGearUseServiceController.java @@ -38,13 +38,8 @@ public class TripSeineGearUseServiceController extends ObserveAuthenticatedServi } @Override - public FormDto<TripSeineGearUseDto> loadToRead(String tripSeineId) { - return service.loadToRead(tripSeineId); - } - - @Override - public FormDto<TripSeineGearUseDto> loadToEdit(String tripSeineId) { - return service.loadToEdit(tripSeineId); + public FormDto<TripSeineGearUseDto> loadForm(String tripSeineId) { + return service.loadForm(tripSeineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java index 7734e25..b30bfb6 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java @@ -58,23 +58,18 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public TripSeineDto loadDto(String tripSeineId) { - return service.loadDto(tripSeineId); - } - - @Override public TripMapDto getTripSeineMap(String tripSeineId) { return service.getTripSeineMap(tripSeineId); } @Override - public boolean exists(String tripSeineId) { - return service.exists(tripSeineId); + public FormDto<TripSeineDto> loadForm(String tripSeineId) { + return service.loadForm(tripSeineId); } @Override - public FormDto<TripSeineDto> loadForm(String tripSeineId) { - return service.loadForm(tripSeineId); + public TripSeineDto loadDto(String tripSeineId) { + return service.loadDto(tripSeineId); } @Override @@ -83,6 +78,11 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override + public boolean exists(String tripSeineId) { + return service.exists(tripSeineId); + } + + @Override public FormDto<TripSeineDto> preCreate(String programId) { return service.preCreate(programId); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.