branch develop updated (07b7cfa -> d889d8f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 07b7cfa migration de l'ecran des activité seine (refs #7593) new d889d8f transformation des entités en reference dans le service plutot qu'en transformant le formdto en referencedto dans l'ui The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d889d8f4868d8e3bcbbeed65cb3add99ae93a0eb Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 15:46:28 2015 +0200 transformation des entités en reference dans le service plutot qu'en transformant le formdto en referencedto dans l'ui Summary of changes: .../fr/ird/observe/ui/tree/ActivityLonglineNode.java | 14 +------------- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 14 +------------- .../fr/ird/observe/ui/tree/ProgramLonglineNode.java | 19 +++---------------- .../java/fr/ird/observe/ui/tree/ProgramSeineNode.java | 18 ++---------------- .../java/fr/ird/observe/ui/tree/RouteSeineNode.java | 13 +------------ .../java/fr/ird/observe/ui/tree/SetLonglineNode.java | 12 +----------- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 12 +----------- .../java/fr/ird/observe/ui/tree/TripLonglineNode.java | 19 +------------------ .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 19 +------------------ .../controller/v1/ReferentialServiceController.java | 6 ++++++ .../longline/ActivityLonglineServiceController.java | 6 ++++++ .../v1/longline/SetLonglineServiceController.java | 6 ++++++ .../v1/longline/TripLonglineServiceController.java | 6 ++++++ .../v1/seine/ActivitySeineServiceController.java | 6 ++++++ .../controller/v1/seine/RouteServiceController.java | 6 ++++++ .../v1/seine/SetSeineServiceController.java | 6 ++++++ .../v1/seine/TripSeineServiceController.java | 6 ++++++ .../observe/services/service/ReferentialService.java | 4 ++++ .../service/longline/ActivityLonglineService.java | 4 ++++ .../services/service/longline/SetLonglineService.java | 4 ++++ .../service/longline/TripLonglineService.java | 4 ++++ .../services/service/seine/ActivitySeineService.java | 4 ++++ .../observe/services/service/seine/RouteService.java | 5 +++++ .../services/service/seine/SetSeineService.java | 4 ++++ .../services/service/seine/TripSeineService.java | 4 ++++ .../services/service/ReferentialServiceTopia.java | 8 ++++++++ .../longline/ActivityLonglineServiceTopia.java | 10 ++++++++++ .../service/longline/SetLonglineServiceTopia.java | 11 +++++++++++ .../service/longline/TripLonglineServiceTopia.java | 10 ++++++++++ .../service/seine/ActivitySeineServiceTopia.java | 9 +++++++++ .../services/service/seine/RouteServiceTopia.java | 13 +++++++++++++ .../services/service/seine/SetSeineServiceTopia.java | 11 +++++++++++ .../services/service/seine/TripSeineServiceTopia.java | 9 +++++++++ 33 files changed, 174 insertions(+), 128 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit d889d8f4868d8e3bcbbeed65cb3add99ae93a0eb Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 15:46:28 2015 +0200 transformation des entités en reference dans le service plutot qu'en transformant le formdto en referencedto dans l'ui --- .../fr/ird/observe/ui/tree/ActivityLonglineNode.java | 14 +------------- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 14 +------------- .../fr/ird/observe/ui/tree/ProgramLonglineNode.java | 19 +++---------------- .../java/fr/ird/observe/ui/tree/ProgramSeineNode.java | 18 ++---------------- .../java/fr/ird/observe/ui/tree/RouteSeineNode.java | 13 +------------ .../java/fr/ird/observe/ui/tree/SetLonglineNode.java | 12 +----------- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 12 +----------- .../java/fr/ird/observe/ui/tree/TripLonglineNode.java | 19 +------------------ .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 19 +------------------ .../controller/v1/ReferentialServiceController.java | 6 ++++++ .../longline/ActivityLonglineServiceController.java | 6 ++++++ .../v1/longline/SetLonglineServiceController.java | 6 ++++++ .../v1/longline/TripLonglineServiceController.java | 6 ++++++ .../v1/seine/ActivitySeineServiceController.java | 6 ++++++ .../controller/v1/seine/RouteServiceController.java | 6 ++++++ .../v1/seine/SetSeineServiceController.java | 6 ++++++ .../v1/seine/TripSeineServiceController.java | 6 ++++++ .../observe/services/service/ReferentialService.java | 4 ++++ .../service/longline/ActivityLonglineService.java | 4 ++++ .../services/service/longline/SetLonglineService.java | 4 ++++ .../service/longline/TripLonglineService.java | 4 ++++ .../services/service/seine/ActivitySeineService.java | 4 ++++ .../observe/services/service/seine/RouteService.java | 5 +++++ .../services/service/seine/SetSeineService.java | 4 ++++ .../services/service/seine/TripSeineService.java | 4 ++++ .../services/service/ReferentialServiceTopia.java | 8 ++++++++ .../longline/ActivityLonglineServiceTopia.java | 10 ++++++++++ .../service/longline/SetLonglineServiceTopia.java | 11 +++++++++++ .../service/longline/TripLonglineServiceTopia.java | 10 ++++++++++ .../service/seine/ActivitySeineServiceTopia.java | 9 +++++++++ .../services/service/seine/RouteServiceTopia.java | 13 +++++++++++++ .../services/service/seine/SetSeineServiceTopia.java | 11 +++++++++++ .../services/service/seine/TripSeineServiceTopia.java | 9 +++++++++ 33 files changed, 174 insertions(+), 128 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java index 1d61903..c6a0f25 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java @@ -22,11 +22,8 @@ package fr.ird.observe.ui.tree; * #L% */ -import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.service.longline.ActivityLonglineService; import fr.ird.observe.ui.tree.loadors.ActivityLonglineNodeChildLoador; @@ -48,16 +45,7 @@ public class ActivityLonglineNode extends DtoNodeSupport<ActivityLonglineDto> { @Override protected ReferenceDto<ActivityLonglineDto> fetchEntity() { ActivityLonglineService service = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); - FormDto<ActivityLonglineDto> formDto = service.loadToRead(entity.getId()); - - //FIXME kmorin 20151005 voir quels attributs sont à récupérer - ReferenceDto<ActivityLonglineDto> referenceDto = - ReferenceDtos.newReferenceDto(ActivityLonglineDto.class, Lists.newArrayList(ActivityLonglineDto.PROPERTY_ID, - ActivityLonglineDto.PROPERTY_TIME_STAMP)); - referenceDto.setId(formDto.getForm().getId()); - referenceDto.setPropertyValue(ActivityLonglineDto.PROPERTY_ID, formDto.getForm().getId()); - referenceDto.setPropertyValue(ActivityLonglineDto.PROPERTY_TIME_STAMP, formDto.getForm().getTimeStamp()); - + ReferenceDto<ActivityLonglineDto> referenceDto = service.loadStubReferenceToRead(entity.getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java index 477d6ea..789bd94 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java @@ -22,11 +22,8 @@ package fr.ird.observe.ui.tree; * #L% */ -import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.service.seine.ActivitySeineService; import fr.ird.observe.ui.tree.loadors.ActivitySeineNodeChildLoador; @@ -48,16 +45,7 @@ public class ActivitySeineNode extends DtoNodeSupport<ActivitySeineDto> { @Override protected ReferenceDto<ActivitySeineDto> fetchEntity() { ActivitySeineService service = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); - FormDto<ActivitySeineDto> formDto = service.loadToRead(getId()); - - //FIXME kmorin 20151005 voir quels attributs sont à récupérer - ReferenceDto<ActivitySeineDto> referenceDto = - ReferenceDtos.newReferenceDto(ActivitySeineDto.class, Lists.newArrayList(ActivitySeineDto.PROPERTY_ID, - ActivitySeineDto.PROPERTY_TIME)); - referenceDto.setId(formDto.getForm().getId()); - referenceDto.setPropertyValue(ActivitySeineDto.PROPERTY_ID, formDto.getForm().getId()); - referenceDto.setPropertyValue(ActivitySeineDto.PROPERTY_TIME, formDto.getForm().getTime()); - + ReferenceDto<ActivitySeineDto> referenceDto = service.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java index 0177f34..de801c1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java @@ -22,14 +22,10 @@ package fr.ird.observe.ui.tree; * #L% */ -import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.ui.tree.loadors.ProgramLonglineNodeChildLoador; @@ -48,23 +44,14 @@ public class ProgramLonglineNode extends DtoNodeSupport<ProgramDto> { entity, ((GearType) entity.getPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE)).name(), ObserveTreeHelper.getChildLoador(ProgramLonglineNodeChildLoador.class)); + // FIXME kmorin 20151012 pkoi refaire un setEntity alors qu'il est fait dans le super ? setEntity(entity); } @Override protected ReferenceDto<ProgramDto> fetchEntity() { - FormDto<ProgramDto> formDto = ObserveSwingApplicationContext.get().newService(ReferentialService.class).loadToRead(ProgramDto.class, id); - ReferenceDto<ProgramDto> referenceDto = - ReferenceDtos.newReferenceDto(ProgramDto.class, Lists.newArrayList(ProgramDto.PROPERTY_ID, - ProgramDto.PROPERTY_CODE, - ProgramDto.PROPERTY_GEAR_TYPE, - ReferentialReferenceDto.PROPERTY_LABEL)); - referenceDto.setId(formDto.getForm().getId()); - referenceDto.setPropertyValue(ProgramDto.PROPERTY_ID, formDto.getForm().getId()); - referenceDto.setPropertyValue(ProgramDto.PROPERTY_CODE, formDto.getForm().getCode()); - referenceDto.setPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE, formDto.getForm().getGearType()); - referenceDto.setPropertyValue(ReferentialReferenceDto.PROPERTY_LABEL, formDto.getForm().getLabel2()); - + ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + ReferenceDto<ProgramDto> referenceDto = service.loadReferenceToRead(ProgramDto.class, getId()); return referenceDto; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java index cb885a1..27706d3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java @@ -22,14 +22,10 @@ package fr.ird.observe.ui.tree; * #L% */ -import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.ui.tree.loadors.ProgramSeineNodeChildLoador; @@ -52,18 +48,8 @@ public class ProgramSeineNode extends DtoNodeSupport<ProgramDto> { @Override protected ReferenceDto<ProgramDto> fetchEntity() { - FormDto<ProgramDto> formDto = ObserveSwingApplicationContext.get().newService(ReferentialService.class).loadToRead(ProgramDto.class, id); - ReferenceDto<ProgramDto> referenceDto = - ReferenceDtos.newReferenceDto(ProgramDto.class, Lists.newArrayList(ProgramDto.PROPERTY_ID, - ProgramDto.PROPERTY_CODE, - ProgramDto.PROPERTY_GEAR_TYPE, - ReferentialReferenceDto.PROPERTY_LABEL)); - referenceDto.setId(formDto.getForm().getId()); - referenceDto.setPropertyValue(ProgramDto.PROPERTY_ID, formDto.getForm().getId()); - referenceDto.setPropertyValue(ProgramDto.PROPERTY_CODE, formDto.getForm().getCode()); - referenceDto.setPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE, formDto.getForm().getGearType()); - referenceDto.setPropertyValue(ReferentialReferenceDto.PROPERTY_LABEL, formDto.getForm().getLabel2()); - + ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + ReferenceDto<ProgramDto> referenceDto = service.loadReferenceToRead(ProgramDto.class, getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java index 9793a41..d2132d0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java @@ -22,11 +22,8 @@ package fr.ird.observe.ui.tree; * #L% */ -import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.seine.RouteService; @@ -47,15 +44,7 @@ public class RouteSeineNode extends DtoNodeSupport<RouteDto> { @Override protected ReferenceDto<RouteDto> fetchEntity() { RouteService routeService = ObserveSwingApplicationContext.get().newService(RouteService.class); - FormDto<RouteDto> formDto = routeService.loadToRead(getId()); - - ReferenceDto<RouteDto> referenceDto = - ReferenceDtos.newReferenceDto(RouteDto.class, Lists.newArrayList(RouteDto.PROPERTY_ID, - RouteDto.PROPERTY_DATE)); - referenceDto.setId(formDto.getForm().getId()); - referenceDto.setPropertyValue(RouteDto.PROPERTY_ID, formDto.getForm().getId()); - referenceDto.setPropertyValue(RouteDto.PROPERTY_DATE, formDto.getForm().getDate()); - + ReferenceDto<RouteDto> referenceDto = routeService.loadReferenceToRead(getId()); return referenceDto; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java index 5993b7f..b15d53b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java @@ -22,11 +22,8 @@ package fr.ird.observe.ui.tree; * #L% */ -import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.ui.tree.loadors.SetLonglineNodeChildLoador; @@ -48,14 +45,7 @@ public class SetLonglineNode extends DtoNodeSupport<SetLonglineDto> { @Override protected ReferenceDto<SetLonglineDto> fetchEntity() { SetLonglineService service = ObserveSwingApplicationContext.get().newService(SetLonglineService.class); - FormDto<SetLonglineDto> formDto = service.loadToRead(entity.getId()); - - //FIXME kmorin 20151005 voir quels attributs sont à récupérer - ReferenceDto<SetLonglineDto> referenceDto = - ReferenceDtos.newReferenceDto(SetLonglineDto.class, Lists.newArrayList(SetLonglineDto.PROPERTY_ID)); - referenceDto.setId(formDto.getForm().getId()); - referenceDto.setPropertyValue(SetLonglineDto.PROPERTY_ID, formDto.getForm().getId()); - + ReferenceDto<SetLonglineDto> referenceDto = service.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java index 0542047..414e18d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java @@ -22,11 +22,8 @@ package fr.ird.observe.ui.tree; * #L% */ -import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.seine.SetSeineService; import fr.ird.observe.ui.tree.loadors.SetSeineNodeChildLoador; @@ -48,14 +45,7 @@ public class SetSeineNode extends DtoNodeSupport<SetSeineDto> { @Override protected ReferenceDto<SetSeineDto> fetchEntity() { SetSeineService service = ObserveSwingApplicationContext.get().newService(SetSeineService.class); - FormDto<SetSeineDto> formDto = service.loadToRead(entity.getId()); - - //FIXME kmorin 20151005 voir quels attributs sont à récupérer - ReferenceDto<SetSeineDto> referenceDto = - ReferenceDtos.newReferenceDto(SetSeineDto.class, Lists.newArrayList(SetSeineDto.PROPERTY_ID)); - referenceDto.setId(formDto.getForm().getId()); - referenceDto.setPropertyValue(SetSeineDto.PROPERTY_ID, formDto.getForm().getId()); - + ReferenceDto<SetSeineDto> referenceDto = service.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java index ed269a7..2a2787d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java @@ -22,11 +22,8 @@ package fr.ird.observe.ui.tree; * #L% */ -import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.service.longline.TripLonglineService; @@ -47,21 +44,7 @@ public class TripLonglineNode extends DtoNodeSupport<TripLonglineDto> { @Override protected ReferenceDto<TripLonglineDto> fetchEntity() { TripLonglineService tripLonglineService = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); - FormDto<TripLonglineDto> formDto = tripLonglineService.loadToRead(getId()); - - ReferenceDto<TripLonglineDto> referenceDto = - ReferenceDtos.newReferenceDto(TripLonglineDto.class, Lists.newArrayList(TripLonglineDto.PROPERTY_ID, - TripLonglineDto.PROPERTY_START_DATE, - TripLonglineDto.PROPERTY_END_DATE, - TripLonglineDto.PROPERTY_VESSEL, - TripLonglineDto.PROPERTY_OBSERVER)); - referenceDto.setId(formDto.getForm().getId()); - referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_ID, formDto.getForm().getId()); - referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_START_DATE, formDto.getForm().getStartDate()); - referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_END_DATE, formDto.getForm().getEndDate()); - referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_VESSEL, formDto.getForm().getVessel()); - referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_OBSERVER, formDto.getForm().getObserver()); - + ReferenceDto<TripLonglineDto> referenceDto = tripLonglineService.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java index 24d9413..efd2dd9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java @@ -22,11 +22,8 @@ package fr.ird.observe.ui.tree; * #L% */ -import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.TripSeineService; @@ -48,21 +45,7 @@ public class TripSeineNode extends DtoNodeSupport<TripSeineDto> { @Override protected ReferenceDto<TripSeineDto> fetchEntity() { TripSeineService tripSeineService = ObserveSwingApplicationContext.get().newService(TripSeineService.class); - FormDto<TripSeineDto> formDto = tripSeineService.loadToRead(getId()); - - ReferenceDto<TripSeineDto> referenceDto = - ReferenceDtos.newReferenceDto(TripSeineDto.class, Lists.newArrayList(TripSeineDto.PROPERTY_ID, - TripSeineDto.PROPERTY_START_DATE, - TripSeineDto.PROPERTY_END_DATE, - TripSeineDto.PROPERTY_VESSEL, - TripSeineDto.PROPERTY_OBSERVER)); - referenceDto.setId(formDto.getForm().getId()); - referenceDto.setPropertyValue(TripSeineDto.PROPERTY_ID, formDto.getForm().getId()); - referenceDto.setPropertyValue(TripSeineDto.PROPERTY_START_DATE, formDto.getForm().getStartDate()); - referenceDto.setPropertyValue(TripSeineDto.PROPERTY_END_DATE, formDto.getForm().getEndDate()); - referenceDto.setPropertyValue(TripSeineDto.PROPERTY_VESSEL, formDto.getForm().getVessel()); - referenceDto.setPropertyValue(TripSeineDto.PROPERTY_OBSERVER, formDto.getForm().getObserver()); - + ReferenceDto<TripSeineDto> referenceDto = tripSeineService.loadReferenceToRead(getId()); return referenceDto; } } 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 c28786d..cf32161 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 @@ -23,6 +23,7 @@ package fr.ird.observe.application.web.controller.v1; */ 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.referential.ReferentialDto; import fr.ird.observe.services.service.DataNotFoundException; @@ -58,6 +59,11 @@ public class ReferentialServiceController extends ObserveAuthenticatedServiceCon } @Override + public <R extends ReferentialDto> ReferenceDto<R> loadReferenceToRead(Class<R> programDtoClass, String id) throws DataNotFoundException { + return service.loadReferenceToRead(programDtoClass, id); + } + + @Override public <R extends ReferentialDto> FormDto<R> loadToEdit(Class<R> type, String id) throws DataNotFoundException { return service.loadToEdit(type, id); } 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 cefa9dc..744959e 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 @@ -24,6 +24,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.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; @@ -50,6 +51,11 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override + public ReferenceDto<ActivityLonglineDto> loadReferenceToRead(String activityLonglineId) { + return service.loadReferenceToRead(activityLonglineId); + } + + @Override public FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId) { return service.loadToEdit(activityLonglineId); } 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 f79c9db..50a55de 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 @@ -24,6 +24,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.ReferenceDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.service.longline.SetLonglineService; @@ -42,6 +43,11 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon } @Override + public ReferenceDto<SetLonglineDto> loadReferenceToRead(String id) { + return service.loadReferenceToRead(id); + } + + @Override public FormDto<SetLonglineDto> loadToEdit(String setLonglineId) { return service.loadToEdit(setLonglineId); } 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 f302220..68f3b40 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 @@ -24,6 +24,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.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -60,6 +61,11 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override + public ReferenceDto<TripLonglineDto> loadReferenceToRead(String id) { + return service.loadReferenceToRead(tripLonglineId); + } + + @Override public FormDto<TripLonglineDto> loadToEdit(String tripLonglineId) { return service.loadToEdit(tripLonglineId); } 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 bf7847c..3914bd6 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 @@ -24,6 +24,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.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; @@ -54,6 +55,11 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override + public ReferenceDto<ActivitySeineDto> loadReferenceToRead(String activitySeineId) { + return service.loadReferenceToRead(activitySeineId); + } + + @Override public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { return service.loadToEdit(activitySeineId); } 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 bc3ae09..e8559ca 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 @@ -24,6 +24,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.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; @@ -54,6 +55,11 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override + public ReferenceDto<RouteDto> loadReferenceToRead(String id) { + return service.loadReferenceToRead(id); + } + + @Override public FormDto<RouteDto> loadToEdit(String routeId) { return service.loadToEdit(routeId); } 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 58ab321..ecfceff 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 @@ -24,6 +24,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.ReferenceDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.seine.SetSeineService; @@ -42,6 +43,11 @@ public class SetSeineServiceController extends ObserveAuthenticatedServiceContro } @Override + public ReferenceDto<SetSeineDto> loadReferenceToRead(String id) { + return service.loadReferenceToRead(id); + } + + @Override public FormDto<SetSeineDto> loadToEdit(String setSeineId) { return service.loadToEdit(setSeineId); } 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 e1b3d91..8c976db 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 @@ -24,6 +24,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.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -65,6 +66,11 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override + public ReferenceDto<TripSeineDto> loadReferenceToRead(String tripSeineId) { + return service.loadReferenceToRead(tripSeineId); + } + + @Override public FormDto<TripSeineDto> preCreate(String programId) { return service.preCreate(programId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java index 9d4921f..d673eeb 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.service; import fr.ird.observe.services.ObserveService; 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.referential.ReferentialDto; import fr.ird.observe.services.spi.DeleteRequest; @@ -51,6 +52,9 @@ public interface ReferentialService extends ObserveService { @ReadReferentialPermission <R extends ReferentialDto> FormDto<R> loadToRead(Class<R> type, String id) throws DataNotFoundException; + @ReadReferentialPermission + <R extends ReferentialDto> ReferenceDto<R> loadReferenceToRead(Class<R> programDtoClass, String id) throws DataNotFoundException; + @WriteReferentialPermission <R extends ReferentialDto> FormDto<R> loadToEdit(Class<R> type, String id) throws DataNotFoundException; 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 0889ff9..eed60c8 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 @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; 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.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; @@ -45,6 +46,9 @@ public interface ActivityLonglineService extends ObserveService { @ReadDataPermission FormDto<ActivityLonglineDto> loadToRead(String activityLonglineId); + @ReadDataPermission + ReferenceDto<ActivityLonglineDto> loadReferenceToRead(String activityLonglineId); + @WriteDataPermission FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId); 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 5ebc557..38cc8a5 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 @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; @@ -39,6 +40,9 @@ public interface SetLonglineService extends ObserveService { @ReadDataPermission FormDto<SetLonglineDto> loadToRead(String setLonglineId); + @ReadDataPermission + ReferenceDto<SetLonglineDto> loadReferenceToRead(String id); + @WriteDataPermission FormDto<SetLonglineDto> loadToEdit(String setLonglineId); 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 18f8264..3cafbdd 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 @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; 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.TripMapDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -51,6 +52,9 @@ public interface TripLonglineService extends ObserveService { @ReadDataPermission FormDto<TripLonglineDto> loadToRead(String tripLonglineId); + @ReadDataPermission + ReferenceDto<TripLonglineDto> loadReferenceToRead(String id); + @WriteDataPermission FormDto<TripLonglineDto> loadToEdit(String tripLonglineId); 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 1aa93f3..1d92f39 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 @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; 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.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; @@ -47,6 +48,9 @@ public interface ActivitySeineService extends ObserveService { @ReadDataPermission FormDto<ActivitySeineDto> loadToRead(String activitySeineId); + @ReadDataPermission + ReferenceDto<ActivitySeineDto> loadReferenceToRead(String activitySeineId); + @WriteDataPermission FormDto<ActivitySeineDto> loadToEdit(String activitySeineId); 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 92922ff..dc3a1c2 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 @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; 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.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; @@ -47,6 +48,9 @@ public interface RouteService extends ObserveService { @ReadDataPermission FormDto<RouteDto> loadToRead(String routeId); + @ReadDataPermission + ReferenceDto<RouteDto> loadReferenceToRead(String id); + @WriteDataPermission FormDto<RouteDto> loadToEdit(String routeId); @@ -62,4 +66,5 @@ public interface RouteService extends ObserveService { @WriteDataPermission @DeleteRequest boolean delete(String tripSeineId, String routeId); + } 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 c0df928..5cba971 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 @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; @@ -39,6 +40,9 @@ public interface SetSeineService extends ObserveService { @ReadDataPermission FormDto<SetSeineDto> loadToRead(String setSeineId); + @ReadDataPermission + ReferenceDto<SetSeineDto> loadReferenceToRead(String id); + @WriteDataPermission FormDto<SetSeineDto> loadToEdit(String setSeineId); 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 83913eb..375057f 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 @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; 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.TripMapDto; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -51,6 +52,9 @@ public interface TripSeineService extends ObserveService { @ReadDataPermission FormDto<TripSeineDto> loadToRead(String tripSeineId); + @ReadDataPermission + ReferenceDto<TripSeineDto> loadReferenceToRead(String tripSeineId); + @WriteDataPermission FormDto<TripSeineDto> loadToEdit(String tripSeineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index 0b8c41f..ca4c003 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.service; import com.google.common.base.Optional; import fr.ird.observe.services.ObserveServiceTopia; 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.referential.ReferentialDto; import org.nuiton.topia.persistence.TopiaEntity; @@ -68,6 +69,13 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe return form; } + @Override + public <D extends ReferentialDto> ReferenceDto<D> loadReferenceToRead(Class<D> dtoType, String id) throws DataNotFoundException { + Class<TopiaEntity> entityType = getEntityType(dtoType); + TopiaEntity entity = loadEntity(dtoType, entityType, id); + ReferenceDto<D> form = entityToReferenceDto(dtoType, entity); + return form; + } @Override public <D extends ReferentialDto> FormDto<D> loadToEdit(Class<D> dtoType, String id) { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java index 25776a3..d1738c9 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java @@ -101,7 +101,17 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements } @Override + public ReferenceDto<ActivityLonglineDto> loadReferenceToRead(String activityLonglineId) { + ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); + + ReferenceDto<ActivityLonglineDto> referenceDto = entityToReferenceDto(ActivityLonglineDto.class, activityLongline); + + return referenceDto; + + } + + @Override public FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId) { ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java index 9f8c9cd..09f9ca6 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java @@ -26,6 +26,7 @@ import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.service.DataNotFoundException; @@ -50,6 +51,16 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL } @Override + public ReferenceDto<SetLonglineDto> loadReferenceToRead(String setLonglineId) { + + SetLongline setLongline = loadEntity(SetLonglineDto.class, SetLongline.class, setLonglineId); + + ReferenceDto<SetLonglineDto> referenceDto = entityToReferenceDto(SetLonglineDto.class, setLongline); + + return referenceDto; + } + + @Override public FormDto<SetLonglineDto> loadToEdit(String setLonglineId) { SetLongline setLongline = loadEntity(SetLonglineDto.class, SetLongline.class, setLonglineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java index 69555d0..b8b859e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java @@ -125,6 +125,16 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override + public ReferenceDto<TripLonglineDto> loadReferenceToRead(String tripLonglineId) { + + TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); + + ReferenceDto<TripLonglineDto> referenceDto = entityToReferenceDto(TripLonglineDto.class, tripLongline); + + return referenceDto; + } + + @Override public FormDto<TripLonglineDto> loadToEdit(String tripLonglineId) { TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index 6630e10..5464125 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -109,6 +109,15 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac } @Override + public ReferenceDto<ActivitySeineDto> loadReferenceToRead(String activitySeineId) { + ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); + + ReferenceDto<ActivitySeineDto> referenceDto = entityToReferenceDto(ActivitySeineDto.class, activitySeine); + + return referenceDto; + } + + @Override public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java index 7a00014..ff473d5 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java @@ -124,6 +124,19 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi } @Override + public ReferenceDto<RouteDto> loadReferenceToRead(String routeId) { + + Route route = loadEntity(RouteDto.class, Route.class, routeId); + + ReferenceDto<RouteDto> referenceDto = entityToReferenceDto(RouteDto.class, route); + + //FIXME +// bindFindeVeilleProperties(route.getActivitySeine(), referenceDto.getForm().getActivitySeine()); + + return referenceDto; + } + + @Override public FormDto<RouteDto> loadToEdit(String routeId) { Route route = loadEntity(RouteDto.class, Route.class, routeId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java index 319b64f..dc32fa8 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java @@ -28,6 +28,7 @@ import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -52,6 +53,16 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein } @Override + public ReferenceDto<SetSeineDto> loadReferenceToRead(String setSeineId) { + + SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); + + ReferenceDto<SetSeineDto> referenceDto = entityToReferenceDto(SetSeineDto.class, setSeine); + + return referenceDto; + } + + @Override public FormDto<SetSeineDto> loadToEdit(String setSeineId) { SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index d0fa952..6bc7397 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -121,6 +121,15 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override + public ReferenceDto<TripSeineDto> loadReferenceToRead(String tripSeineId) { + TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); + + ReferenceDto<TripSeineDto> referenceDto = entityToReferenceDto(TripSeineDto.class, tripSeine); + + return referenceDto; + } + + @Override public FormDto<TripSeineDto> loadToEdit(String tripSeineId) { TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm