[Observe-commits] 10/11: Impact des modifications sur l'application web

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 ed4ede628f932fc16b7bda7dc4a2ade175d2b308 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 29 15:19:07 2015 +0100 Impact des modifications sur l'application web --- .../v1/ReferenceSetServiceController.java | 30 ------------------ .../v1/ReferentialServiceController.java | 36 +++++++++------------- .../ActivityLongLineEncouterServiceController.java | 4 +-- ...ctivityLongLineSensorUsedServiceController.java | 4 +-- .../ActivityLonglineServiceController.java | 14 ++++----- .../v1/longline/BranchlineServiceController.java | 4 +-- .../SetLonglineCatchServiceController.java | 4 +-- ...LonglineDetailCompositionServiceController.java | 4 +-- ...LonglineGlobalCompositionServiceController.java | 4 +-- .../v1/longline/SetLonglineServiceController.java | 10 +++--- .../v1/longline/TdrServiceController.java | 4 +-- .../TripLonglineGearUseServiceController.java | 4 +-- .../v1/longline/TripLonglineServiceController.java | 16 +++++----- ...tivitySeineObservedSystemServiceController.java | 4 +-- .../v1/seine/ActivitySeineServiceController.java | 14 ++++----- .../v1/seine/FloatingObjectServiceController.java | 14 ++++----- .../v1/seine/NonTargetCatchServiceController.java | 4 +-- .../v1/seine/NonTargetSampleServiceController.java | 4 +-- .../ObjectObservedSpeciesServiceController.java | 4 +-- .../ObjectSchoolEstimateServiceController.java | 4 +-- .../v1/seine/RouteServiceController.java | 14 ++++----- .../v1/seine/SchoolEstimateServiceController.java | 4 +-- .../v1/seine/SetSeineServiceController.java | 10 +++--- .../v1/seine/TargetCatchServiceController.java | 4 +-- .../v1/seine/TargetSampleServiceController.java | 4 +-- ...TransmittingBuoyOperationServiceController.java | 4 +-- .../seine/TripSeineGearUseServiceController.java | 4 +-- .../v1/seine/TripSeineServiceController.java | 16 +++++----- .../ObserveReferenceSetRequestInjector.java | 8 ++--- 29 files changed, 108 insertions(+), 146 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferenceSetServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferenceSetServiceController.java deleted file mode 100644 index ee5c30c..0000000 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferenceSetServiceController.java +++ /dev/null @@ -1,30 +0,0 @@ -package fr.ird.observe.application.web.controller.v1; - -import fr.ird.observe.services.dto.reference.ObserveReference; -import fr.ird.observe.services.dto.reference.ObserveReferenceSetRequest; -import fr.ird.observe.services.dto.reference.ObserveReferentialReference; -import fr.ird.observe.services.service.ReferenceSetService; -import fr.ird.observe.services.dto.reference.ObserveReferenceSetResult; - -/** - * Created on 11/11/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ReferenceSetServiceController extends ObserveAuthenticatedServiceControllerSupport<ReferenceSetService> implements ReferenceSetService { - - public ReferenceSetServiceController() { - super(ReferenceSetService.class); - } - - @Override - public ObserveReferenceSetResult<ObserveReference> loadDataReferenceSets(ObserveReferenceSetRequest request) { - return service.loadDataReferenceSets(request); - } - - @Override - public ObserveReferenceSetResult<ObserveReferentialReference> loadReferentialReferenceSets(ObserveReferenceSetRequest request) { - return service.loadReferentialReferenceSets(request); - } - -} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java index 464e0ee..8044135 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java @@ -22,13 +22,15 @@ package fr.ird.observe.application.web.controller.v1; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.DtoMap; -import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.service.DataNotFoundException; +import fr.ird.observe.services.service.ReferenceSetsRequest; import fr.ird.observe.services.service.ReferentialService; import java.util.Collection; @@ -46,18 +48,13 @@ public class ReferentialServiceController extends ObserveAuthenticatedServiceCon } @Override - public <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSetWithTechnicalInformations(Class<R> type) { - return service.getReferentialReferenceSetWithTechnicalInformations(type); + public <R extends ReferentialDto> ReferentialReferenceSet<R> getReferenceSet(Class<R> type, Date lastUpdateDate) { + return service.getReferenceSet(type, lastUpdateDate); } @Override - public <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSet(Class<R> type) { - return service.getReferentialReferenceSet(type); - } - - @Override - public <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSetIfModify(Class<R> type, Date updateAfter) { - return service.getReferentialReferenceSetIfModify(type, updateAfter); + public ImmutableSet<ReferentialReferenceSet<?>> getReferentialReferenceSets(ReferenceSetsRequest request) { + return service.getReferentialReferenceSets(request); } @Override @@ -66,22 +63,17 @@ public class ReferentialServiceController extends ObserveAuthenticatedServiceCon } @Override - public <R extends ReferentialDto> FormDto<R> loadToRead(Class<R> type, String id) throws DataNotFoundException { - return service.loadToRead(type, id); - } - - @Override - public <R extends ReferentialDto> ReferenceDto<R> loadReferenceToRead(Class<R> programDtoClass, String id) throws DataNotFoundException { - return service.loadReferenceToRead(programDtoClass, id); + public <R extends ReferentialDto> Form<R> loadForm(Class<R> type, String id) throws DataNotFoundException { + return service.loadForm(type, id); } @Override - public <R extends ReferentialDto> FormDto<R> loadToEdit(Class<R> type, String id) throws DataNotFoundException { - return service.loadToEdit(type, id); + public <R extends ReferentialDto> ReferentialReference<R> loadReference(Class<R> type, String id) throws DataNotFoundException { + return service.loadReference(type, id); } @Override - public <R extends ReferentialDto> FormDto<R> preCreate(Class<R> type) { + public <R extends ReferentialDto> Form<R> preCreate(Class<R> type) { return service.preCreate(type); } 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 cda5cd4..21c67f2 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.ActivityLongLineEncouterService; @@ -38,7 +38,7 @@ public class ActivityLongLineEncouterServiceController extends ObserveAuthentica } @Override - public FormDto<ActivityLonglineEncouterDto> loadForm(String activityLonglineId) { + public Form<ActivityLonglineEncouterDto> loadForm(String activityLonglineId) { return service.loadForm(activityLonglineId); } 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 95bf586..e4908fa 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.ActivityLongLineSensorUsedService; @@ -38,7 +38,7 @@ public class ActivityLongLineSensorUsedServiceController extends ObserveAuthenti } @Override - public FormDto<ActivityLonglineSensorUsedDto> loadForm(String activityLonglineId) { + public Form<ActivityLonglineSensorUsedDto> loadForm(String activityLonglineId) { return service.loadForm(activityLonglineId); } 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 cd4466d..fdc0681 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 @@ -23,9 +23,9 @@ package fr.ird.observe.application.web.controller.v1.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.service.longline.ActivityLonglineService; @@ -42,7 +42,7 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override - public ReferenceSetDto<ActivityLonglineDto> getActivityLonglineByTripLongline(String tripLonglineId) { + public DataReferenceSet<ActivityLonglineDto> getActivityLonglineByTripLongline(String tripLonglineId) { return service.getActivityLonglineByTripLongline(tripLonglineId); } @@ -52,7 +52,7 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override - public FormDto<ActivityLonglineDto> loadForm(String activityLonglineId) { + public Form<ActivityLonglineDto> loadForm(String activityLonglineId) { return service.loadForm(activityLonglineId); } @@ -62,7 +62,7 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override - public ReferenceDto<ActivityLonglineDto> loadReferenceToRead(String activityLonglineId) { + public DataReference<ActivityLonglineDto> loadReferenceToRead(String activityLonglineId) { return service.loadReferenceToRead(activityLonglineId); } @@ -72,7 +72,7 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override - public FormDto<ActivityLonglineDto> preCreate(String tripLonglineId) { + public Form<ActivityLonglineDto> preCreate(String tripLonglineId) { return service.preCreate(tripLonglineId); } 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 ce38864..ad6e4e5 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 @@ -1,7 +1,7 @@ package fr.ird.observe.application.web.controller.v1.longline; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.service.longline.BranchlineService; @@ -15,7 +15,7 @@ public class BranchlineServiceController extends ObserveAuthenticatedServiceCont } @Override - public FormDto<BranchlineDto> loadForm(String branchlineId) { + public Form<BranchlineDto> loadForm(String branchlineId) { return service.loadForm(branchlineId); } 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 8ed0131..c8ff9a6 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.SetLonglineCatchService; @@ -38,7 +38,7 @@ public class SetLonglineCatchServiceController extends ObserveAuthenticatedServi } @Override - public FormDto<SetLonglineCatchDto> loadForm(String setLonglineId) { + public Form<SetLonglineCatchDto> loadForm(String setLonglineId) { return service.loadForm(setLonglineId); } 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 15b43ec..28c513e 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.SetLonglineDetailCompositionService; @@ -38,7 +38,7 @@ public class SetLonglineDetailCompositionServiceController extends ObserveAuthen } @Override - public FormDto<SetLonglineDetailCompositionDto> loadForm(String setLonglineId) { + public Form<SetLonglineDetailCompositionDto> loadForm(String setLonglineId) { return service.loadForm(setLonglineId); } 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 3fca427..e469ba9 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.SetLonglineGlobalCompositionService; @@ -38,7 +38,7 @@ public class SetLonglineGlobalCompositionServiceController extends ObserveAuthen } @Override - public FormDto<SetLonglineGlobalCompositionDto> loadForm(String setLonglineId) { + public Form<SetLonglineGlobalCompositionDto> loadForm(String setLonglineId) { return service.loadForm(setLonglineId); } 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 8230595..e409cbf 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 @@ -23,8 +23,8 @@ package fr.ird.observe.application.web.controller.v1.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.SetLonglineService; @@ -39,7 +39,7 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon } @Override - public FormDto<SetLonglineDto> loadForm(String setLonglineId) { + public Form<SetLonglineDto> loadForm(String setLonglineId) { return service.loadForm(setLonglineId); } @@ -49,7 +49,7 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon } @Override - public ReferenceDto<SetLonglineDto> loadReferenceToRead(String setLonglineId) { + public DataReference<SetLonglineDto> loadReferenceToRead(String setLonglineId) { return service.loadReferenceToRead(setLonglineId); } @@ -59,7 +59,7 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon } @Override - public FormDto<SetLonglineDto> preCreate(String activityLonglineId) { + public Form<SetLonglineDto> preCreate(String activityLonglineId) { return service.preCreate(activityLonglineId); } 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 b63e6cc..e698270 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.TdrService; @@ -38,7 +38,7 @@ public class TdrServiceController extends ObserveAuthenticatedServiceControllerS } @Override - public FormDto<SetLonglineTdrDto> loadForm(String setLonglineId) { + public Form<SetLonglineTdrDto> loadForm(String setLonglineId) { return service.loadForm(setLonglineId); } 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 7d28e5c..86ffc23 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.TripLonglineGearUseService; @@ -38,7 +38,7 @@ public class TripLonglineGearUseServiceController extends ObserveAuthenticatedSe } @Override - public FormDto<TripLonglineGearUseDto> loadForm(String tripLonglineId) { + public Form<TripLonglineGearUseDto> loadForm(String tripLonglineId) { return service.loadForm(tripLonglineId); } 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 17808e3..08968a9 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 @@ -23,9 +23,9 @@ package fr.ird.observe.application.web.controller.v1.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -43,12 +43,12 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public ReferenceSetDto<TripLonglineDto> getAllTripLongline() { + public DataReferenceSet<TripLonglineDto> getAllTripLongline() { return service.getAllTripLongline(); } @Override - public ReferenceSetDto<TripLonglineDto> getTripLonglineByProgram(String programId) { + public DataReferenceSet<TripLonglineDto> getTripLonglineByProgram(String programId) { return service.getTripLonglineByProgram(programId); } @@ -63,7 +63,7 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public FormDto<TripLonglineDto> loadForm(String tripLonglineId) { + public Form<TripLonglineDto> loadForm(String tripLonglineId) { return service.loadForm(tripLonglineId); } @@ -73,7 +73,7 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public ReferenceDto<TripLonglineDto> loadReferenceToRead(String tripLonglineId) { + public DataReference<TripLonglineDto> loadReferenceToRead(String tripLonglineId) { return service.loadReferenceToRead(tripLonglineId); } @@ -83,7 +83,7 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public FormDto<TripLonglineDto> preCreate(String programId) { + public Form<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 ae3d1ad..69ff042 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; @@ -38,7 +38,7 @@ public class ActivitySeineObservedSystemServiceController extends ObserveAuthent } @Override - public FormDto<ActivitySeineObservedSystemDto> loadForm(String activitySeineId) { + public Form<ActivitySeineObservedSystemDto> loadForm(String activitySeineId) { return service.loadForm(activitySeineId); } 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 70ad39d..7d97c12 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 @@ -23,9 +23,9 @@ package fr.ird.observe.application.web.controller.v1.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.service.seine.ActivitySeineService; @@ -42,7 +42,7 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override - public ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId) { + public DataReferenceSet<ActivitySeineDto> getActivitySeineByRoute(String routeId) { return service.getActivitySeineByRoute(routeId); } @@ -52,7 +52,7 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override - public FormDto<ActivitySeineDto> loadForm(String activitySeineId) { + public Form<ActivitySeineDto> loadForm(String activitySeineId) { return service.loadForm(activitySeineId); } @@ -62,7 +62,7 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override - public ReferenceDto<ActivitySeineDto> loadReferenceToRead(String activitySeineId) { + public DataReference<ActivitySeineDto> loadReferenceToRead(String activitySeineId) { return service.loadReferenceToRead(activitySeineId); } @@ -72,7 +72,7 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override - public FormDto<ActivitySeineDto> preCreate(String routeId) { + public Form<ActivitySeineDto> preCreate(String routeId) { return service.preCreate(routeId); } 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 5f9dcad..7014276 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 @@ -23,9 +23,9 @@ package fr.ird.observe.application.web.controller.v1.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.service.seine.FloatingObjectService; @@ -39,12 +39,12 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService } @Override - public ReferenceSetDto<FloatingObjectDto> getFloatingObjectByActivitySeine(String activitySeineId) { + public DataReferenceSet<FloatingObjectDto> getFloatingObjectByActivitySeine(String activitySeineId) { return service.getFloatingObjectByActivitySeine(activitySeineId); } @Override - public FormDto<FloatingObjectDto> loadForm(String floatingObjectId) { + public Form<FloatingObjectDto> loadForm(String floatingObjectId) { return service.loadForm(floatingObjectId); } @@ -54,7 +54,7 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService } @Override - public ReferenceDto<FloatingObjectDto> loadReferenceToRead(String floatingObjectId) { + public DataReference<FloatingObjectDto> loadReferenceToRead(String floatingObjectId) { return service.loadReferenceToRead(floatingObjectId); } @@ -64,7 +64,7 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService } @Override - public FormDto<FloatingObjectDto> preCreate(String activitySeineId) { + public Form<FloatingObjectDto> preCreate(String activitySeineId) { return service.preCreate(activitySeineId); } 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 5741cfa..cd82162 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.service.seine.NonTargetCatchService; @@ -38,7 +38,7 @@ public class NonTargetCatchServiceController extends ObserveAuthenticatedService } @Override - public FormDto<SetSeineNonTargetCatchDto> loadForm(String setSeineId, String tripSeineId) { + public Form<SetSeineNonTargetCatchDto> loadForm(String setSeineId, String tripSeineId) { return service.loadForm(setSeineId, tripSeineId); } 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 fda1ecd..3448203 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; import fr.ird.observe.services.service.seine.NonTargetSampleService; @@ -42,7 +42,7 @@ public class NonTargetSampleServiceController extends ObserveAuthenticatedServic } @Override - public FormDto<NonTargetSampleDto> loadForm(String setSeineId) { + public Form<NonTargetSampleDto> loadForm(String setSeineId) { return service.loadForm(setSeineId); } 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 c12d497..a1a112d 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import fr.ird.observe.services.service.seine.ObjectObservedSpeciesService; @@ -37,7 +37,7 @@ public class ObjectObservedSpeciesServiceController extends ObserveAuthenticated } @Override - public FormDto<FloatingObjectObservedSpeciesDto> loadForm(String floatingObjectId) { + public Form<FloatingObjectObservedSpeciesDto> loadForm(String floatingObjectId) { return service.loadForm(floatingObjectId); } 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 5a4410c..0754a74 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.service.seine.ObjectSchoolEstimateService; @@ -37,7 +37,7 @@ public class ObjectSchoolEstimateServiceController extends ObserveAuthenticatedS } @Override - public FormDto<FloatingObjectSchoolEstimateDto> loadForm(String floatingObjectId) { + public Form<FloatingObjectSchoolEstimateDto> loadForm(String floatingObjectId) { return service.loadForm(floatingObjectId); } 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 2e1475b..807f599 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 @@ -23,9 +23,9 @@ package fr.ird.observe.application.web.controller.v1.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.seine.RouteService; @@ -42,7 +42,7 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override - public ReferenceSetDto<RouteDto> getRouteByTripSeine(String tripSeineId) { + public DataReferenceSet<RouteDto> getRouteByTripSeine(String tripSeineId) { return service.getRouteByTripSeine(tripSeineId); } @@ -52,7 +52,7 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override - public FormDto<RouteDto> loadForm(String routeId) { + public Form<RouteDto> loadForm(String routeId) { return service.loadForm(routeId); } @@ -62,7 +62,7 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override - public ReferenceDto<RouteDto> loadReferenceToRead(String routeId) { + public DataReference<RouteDto> loadReferenceToRead(String routeId) { return service.loadReferenceToRead(routeId); } @@ -72,7 +72,7 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override - public FormDto<RouteDto> preCreate(String tripSeineId) { + public Form<RouteDto> preCreate(String tripSeineId) { return service.preCreate(tripSeineId); } 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 8ddb8fb..bec5d5c 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.service.seine.SchoolEstimateService; @@ -37,7 +37,7 @@ public class SchoolEstimateServiceController extends ObserveAuthenticatedService } @Override - public FormDto<SetSeineSchoolEstimateDto> loadForm(String setSeineId, String tripSeineId) { + public Form<SetSeineSchoolEstimateDto> loadForm(String setSeineId, String tripSeineId) { return service.loadForm(setSeineId, tripSeineId); } 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 abdf5c4..22b6633 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 @@ -23,8 +23,8 @@ package fr.ird.observe.application.web.controller.v1.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.seine.SetSeineService; @@ -38,7 +38,7 @@ public class SetSeineServiceController extends ObserveAuthenticatedServiceContro } @Override - public FormDto<SetSeineDto> loadForm(String setSeineId) { + public Form<SetSeineDto> loadForm(String setSeineId) { return service.loadForm(setSeineId); } @@ -48,7 +48,7 @@ public class SetSeineServiceController extends ObserveAuthenticatedServiceContro } @Override - public ReferenceDto<SetSeineDto> loadReferenceToRead(String setSeineId) { + public DataReference<SetSeineDto> loadReferenceToRead(String setSeineId) { return service.loadReferenceToRead(setSeineId); } @@ -58,7 +58,7 @@ public class SetSeineServiceController extends ObserveAuthenticatedServiceContro } @Override - public FormDto<SetSeineDto> preCreate(String routeId, String activitySeineId) { + public Form<SetSeineDto> preCreate(String routeId, String activitySeineId) { return service.preCreate(routeId, activitySeineId); } 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 d49eb00..cf613f5 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.service.seine.TargetCatchService; @@ -38,7 +38,7 @@ public class TargetCatchServiceController extends ObserveAuthenticatedServiceCon } @Override - public FormDto<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded, String tripSeineId) { + public Form<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded, String tripSeineId) { return service.loadForm(setSeineId, discarded, tripSeineId); } 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 f425ee5..d9128bd 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.service.seine.TargetSampleService; @@ -43,7 +43,7 @@ public class TargetSampleServiceController extends ObserveAuthenticatedServiceCo } @Override - public FormDto<TargetSampleDto> loadForm(String setSeineId, boolean discarded) { + public Form<TargetSampleDto> loadForm(String setSeineId, boolean discarded) { return service.loadForm(setSeineId, discarded); } 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 fbc55e8..c9a861f 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.services.service.seine.TransmittingBuoyOperationService; @@ -37,7 +37,7 @@ public class TransmittingBuoyOperationServiceController extends ObserveAuthentic } @Override - public FormDto<FloatingObjectTransmittingBuoyDto> loadForm(String floatingObjectId) { + public Form<FloatingObjectTransmittingBuoyDto> loadForm(String floatingObjectId) { return service.loadForm(floatingObjectId); } 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 e31c6ff..0d4e1c5 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 @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import fr.ird.observe.services.service.seine.TripSeineGearUseService; @@ -38,7 +38,7 @@ public class TripSeineGearUseServiceController extends ObserveAuthenticatedServi } @Override - public FormDto<TripSeineGearUseDto> loadForm(String tripSeineId) { + public Form<TripSeineGearUseDto> loadForm(String tripSeineId) { return service.loadForm(tripSeineId); } 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 b30bfb6..a7be8d0 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 @@ -23,9 +23,9 @@ package fr.ird.observe.application.web.controller.v1.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -43,12 +43,12 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public ReferenceSetDto<TripSeineDto> getAllTripSeine() { + public DataReferenceSet<TripSeineDto> getAllTripSeine() { return service.getAllTripSeine(); } @Override - public ReferenceSetDto<TripSeineDto> getTripSeineByProgram(String programId) { + public DataReferenceSet<TripSeineDto> getTripSeineByProgram(String programId) { return service.getTripSeineByProgram(programId); } @@ -63,7 +63,7 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public FormDto<TripSeineDto> loadForm(String tripSeineId) { + public Form<TripSeineDto> loadForm(String tripSeineId) { return service.loadForm(tripSeineId); } @@ -73,7 +73,7 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public ReferenceDto<TripSeineDto> loadReferenceToRead(String tripSeineId) { + public DataReference<TripSeineDto> loadReferenceToRead(String tripSeineId) { return service.loadReferenceToRead(tripSeineId); } @@ -83,7 +83,7 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public FormDto<TripSeineDto> preCreate(String programId) { + public Form<TripSeineDto> preCreate(String programId) { return service.preCreate(programId); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java index 61edb8e..a5e6447 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java @@ -2,7 +2,7 @@ package fr.ird.observe.application.web.injector; import com.google.common.base.Preconditions; import com.google.gson.Gson; -import fr.ird.observe.services.dto.reference.ObserveReferenceSetRequest; +import fr.ird.observe.services.service.ReferenceSetsRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.debux.webmotion.server.call.Call; @@ -30,14 +30,14 @@ public class ObserveReferenceSetRequestInjector implements ExecutorParametersInj @Override public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { - ObserveReferenceSetRequest referenceSetRequest = null; - if (type.equals(ObserveReferenceSetRequest.class)) { + ReferenceSetsRequest referenceSetRequest = null; + if (type.equals(ReferenceSetsRequest.class)) { Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); Preconditions.checkNotNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!"); String gsonContent = ((String[]) parameterTree.getValue())[0]; - referenceSetRequest = gson.fromJson(gsonContent, ObserveReferenceSetRequest.class); + referenceSetRequest = gson.fromJson(gsonContent, ReferenceSetsRequest.class); if (log.isInfoEnabled()) { log.info("Inject referenceSetRequest: " + referenceSetRequest); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.