branch feature/7531 updated (f12b43c -> 20e26b1)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7531 in repository observe. See http://git.codelutin.com/observe.git from f12b43c suppression des fixme (refs #7531) new 20e26b1 utilisation des services dans getChilds des lists (refs #7531) 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 20e26b1cd218aa40f5032e5e4324289e2b7895f0 Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 28 17:40:07 2015 +0200 utilisation des services dans getChilds des lists (refs #7531) Summary of changes: .../content/impl/longline/BranchlineUIHandler.java | 8 ++--- .../LonglineDetailCompositionUIHandler.java | 36 ++++++++++++---------- .../LonglineDetailCompositionUIInitializer.java | 4 --- .../longline/LonglineDetailCompositionUIModel.java | 7 ----- .../impl/longline/ActivityLonglinesUIHandler.java | 26 ++++++++-------- .../list/impl/longline/TripLonglinesUIHandler.java | 27 ++++++++-------- .../list/impl/seine/ActivitySeinesUIHandler.java | 26 ++++++++-------- .../content/list/impl/seine/RoutesUIHandler.java | 25 +++++++-------- .../list/impl/seine/TripSeinesUIHandler.java | 29 ++++++++--------- .../ActivityLonglineServiceController.java | 5 ++- .../v1/longline/TripLonglineServiceController.java | 5 ++- .../v1/seine/ActivitySeineServiceController.java | 5 ++- .../v1/seine/RouteServiceController.java | 5 ++- .../v1/seine/TripSeineServiceController.java | 5 ++- .../service/longline/ActivityLonglineService.java | 5 ++- .../service/longline/TripLonglineService.java | 5 ++- .../service/seine/ActivitySeineService.java | 5 ++- .../services/service/seine/RouteService.java | 5 ++- .../services/service/seine/TripSeineService.java | 5 ++- .../longline/ActivityLonglineServiceTopia.java | 30 +++++++++--------- .../service/longline/TripLonglineServiceTopia.java | 25 ++++++++------- .../service/seine/ActivitySeineServiceTopia.java | 28 +++++++++-------- .../services/service/seine/RouteServiceTopia.java | 24 +++++++++------ .../service/seine/TripSeineServiceTopia.java | 25 ++++++++------- 24 files changed, 184 insertions(+), 186 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 feature/7531 in repository observe. See http://git.codelutin.com/observe.git commit 20e26b1cd218aa40f5032e5e4324289e2b7895f0 Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 28 17:40:07 2015 +0200 utilisation des services dans getChilds des lists (refs #7531) --- .../content/impl/longline/BranchlineUIHandler.java | 8 ++--- .../LonglineDetailCompositionUIHandler.java | 36 ++++++++++++---------- .../LonglineDetailCompositionUIInitializer.java | 4 --- .../longline/LonglineDetailCompositionUIModel.java | 7 ----- .../impl/longline/ActivityLonglinesUIHandler.java | 26 ++++++++-------- .../list/impl/longline/TripLonglinesUIHandler.java | 27 ++++++++-------- .../list/impl/seine/ActivitySeinesUIHandler.java | 26 ++++++++-------- .../content/list/impl/seine/RoutesUIHandler.java | 25 +++++++-------- .../list/impl/seine/TripSeinesUIHandler.java | 29 ++++++++--------- .../ActivityLonglineServiceController.java | 5 ++- .../v1/longline/TripLonglineServiceController.java | 5 ++- .../v1/seine/ActivitySeineServiceController.java | 5 ++- .../v1/seine/RouteServiceController.java | 5 ++- .../v1/seine/TripSeineServiceController.java | 5 ++- .../service/longline/ActivityLonglineService.java | 5 ++- .../service/longline/TripLonglineService.java | 5 ++- .../service/seine/ActivitySeineService.java | 5 ++- .../services/service/seine/RouteService.java | 5 ++- .../services/service/seine/TripSeineService.java | 5 ++- .../longline/ActivityLonglineServiceTopia.java | 30 +++++++++--------- .../service/longline/TripLonglineServiceTopia.java | 25 ++++++++------- .../service/seine/ActivitySeineServiceTopia.java | 28 +++++++++-------- .../services/service/seine/RouteServiceTopia.java | 24 +++++++++------ .../service/seine/TripSeineServiceTopia.java | 25 ++++++++------- 24 files changed, 184 insertions(+), 186 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java index f3d5478..52f3c67 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java @@ -27,6 +27,7 @@ import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.BranchlineDtos; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -81,9 +82,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { } getModel().setBranchline(branchline); - //FIXME -// getLoadBinder().copy(branchline, getBean()); -// loadBean(branchline); + BranchlineDtos.copyBranchlineDto(branchline, getBean()); if (branchline == null) { @@ -223,8 +222,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { // bind back to model branchline BranchlineDto beanToSave = getModel().getBranchline(); - //FIXME -// binder.copy(bean, beanToSave); + BranchlineDtos.copyBranchlineDto(bean, beanToSave); // for external models getModel().fireSaved(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index 56da8e2..8de09df 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -27,11 +27,14 @@ import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.entities.longline.SectionTemplate; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDtos; +import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; @@ -90,7 +93,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong @Override public void tableChanged(TableModelEvent e) { SectionsTableModel source = (SectionsTableModel) e.getSource(); - //FIXME +// FIXME // onSectionsTableModelChanged(source.getData()); } }; @@ -309,8 +312,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong this.branchlineDecorator = getDecoratorService().getDecoratorByType(BranchlineDto.class); LonglineDetailCompositionUIInitializer uiInitializer = new LonglineDetailCompositionUIInitializer(getUi()); - //FIXME -// uiInitializer.initUI(getDataSource()); + uiInitializer.initUI(); LonglineDetailCompositionUI ui1 = getUi(); @@ -372,10 +374,6 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong super.openUI(); - // Load binders (used to load section, basket, branchline binders...) - //FIXME -// getLoadBinder(); - { // open brancheline detail BranchlineUI branchlineDetailUI = getUi().getBranchlineDetailUI(); @@ -388,20 +386,22 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong log.info("setId = " + setId); } ContentMode mode = computeContentMode(); + // utilisation du mode requis + setContentMode(mode); - //FIXME -// DataService dataService = getDataService(); + SetLonglineService setLonglineService = getSetLonglineService(); - DataSource source = getDataSource(); + FormDto<SetLonglineDto> setLonglineDtoFormDto; + if (mode == ContentMode.READ) { + setLonglineDtoFormDto = setLonglineService.loadToRead(setId); - // update mode - //FIXME -// dataService.loadEditEntity(source, setId, getLoadExecutor()); - - // utilisation du mode requis - setContentMode(mode); + } else { + setLonglineDtoFormDto = setLonglineService.loadToEdit(setId); + } + getModel().setFormDto(setLonglineDtoFormDto); SetLonglineDto bean = getBean(); + SetLonglineDtos.copySetLonglineDto(setLonglineDtoFormDto.getForm(), bean); //FIXME Validate this default date if (log.isInfoEnabled()) { @@ -1618,4 +1618,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } + protected SetLonglineService getSetLonglineService() { + return ObserveSwingApplicationContext.get().newService(SetLonglineService.class); + } + } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java index 2262b7d..37dbbcd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java @@ -58,10 +58,6 @@ public class LonglineDetailCompositionUIInitializer extends ContentUIInitializer LonglineDetailCompositionUIModel model = ui.getModel(); - // To be sure all loaders are initialized - //FIXME -// model.getLoadBinder(); - { // init section templates table JTable table = ui.getSectionTemplatesTable(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java index ebd363b..fea3f23 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java @@ -61,13 +61,6 @@ public class LonglineDetailCompositionUIModel extends ContentUIModel<SetLongline protected boolean branchlineDetailTabValid; - //FIXME -// protected TopiaEntityBinder<SectionDto> sectionBinder; -// -// protected TopiaEntityBinder<BasketDto> basketBinder; -// -// protected TopiaEntityBinder<BranchlineDto> branchlineBinder; - public LonglineDetailCompositionUIModel() { super(SetLonglineDto.class); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index 87ff3e9..d3b6aa2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -22,17 +22,21 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; 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; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.service.longline.ActivityLonglineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -110,18 +114,14 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin @Override protected List<ReferenceDto> getChilds(TripLonglineDto bean) { - DataSource source = getDataSource(); - //FIXME -// DataService dataService = getDataService(); -// -// List<ActivityLongline> list = dataService.getActivityLonglineStubByTrip(source, bean.getTopiaId()); -// -// if (log.isDebugEnabled()) { -// log.debug("Will use " + list.size() + " activities."); -// } -// -// return list; - return null; + ActivityLonglineService service = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); + ReferenceSetDto<ActivityLonglineStubDto> activityLonglineStubByRoute = service.getActivityLonglineStubByRoute(bean.getId()); + + if (log.isDebugEnabled()) { + log.debug("Will use " + activityLonglineStubByRoute.sizeReference() + " activities."); + } + + return new ArrayList<>(activityLonglineStubByRoute.getReference()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java index ac6da70..5548135 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java @@ -22,17 +22,21 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -93,19 +97,14 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, Tri @Override protected List<ReferenceDto> getChilds(ProgramDto bean) { - DataSource source = getDataSource(); - //FIXME -// DataService dataService = getDataService(); -// -// List<TripLongline> list = dataService.getTripLonglineStubByProgram(source, bean.getTopiaId()); -// -// if (log.isDebugEnabled()) { -// log.debug("Will use " + list.size() + " trips."); -// } -// -// return list; - - return null; + TripLonglineService service = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); + ReferenceSetDto<TripLonglineStubDto> tripLonglineStubByProgram = service.getTripLonglineStubByProgram(bean.getId()); + + if (log.isDebugEnabled()) { + log.debug("Will use " + tripLonglineStubByProgram.sizeReference() + " trips."); + } + + return new ArrayList<>(tripLonglineStubByProgram.getReference()); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java index b24fd39..405edc7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java @@ -21,17 +21,21 @@ */ package fr.ird.observe.ui.content.list.impl.seine; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.service.seine.ActivitySeineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -108,18 +112,14 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti @Override protected List<ReferenceDto> getChilds(RouteDto bean) { - DataSource source = getDataSource(); - //FIXME -// DataService dataService = getDataService(); -// -// List<ActivitySeine> list = dataService.getActivitySeineStubByRoute(source, bean.getTopiaId()); -// -// if (log.isDebugEnabled()) { -// log.debug("Will use " + list.size() + " activities."); -// } -// -// return list; - return null; + ActivitySeineService service = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); + ReferenceSetDto<ActivitySeineStubDto> activitySeineStubByRoute = service.getActivitySeineStubByRoute(bean.getId()); + + if (log.isDebugEnabled()) { + log.debug("Will use " + activitySeineStubByRoute.sizeReference() + " activities."); + } + + return new ArrayList<>(activitySeineStubByRoute.getReference()); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java index fcd5f74..d424f3c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java @@ -21,16 +21,21 @@ */ package fr.ird.observe.ui.content.list.impl.seine; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -104,18 +109,14 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto @Override protected List<ReferenceDto> getChilds(TripSeineDto bean) { - //FIXME -// DataSource source = getDataSource(); -// DataService dataService = getDataService(); -// -// List<Route> list = dataService.getRouteStubByTrip(source, bean.getTopiaId()); -// -// if (log.isDebugEnabled()) { -// log.debug("Will use " + list.size() + " routes."); -// } -// -// return list; - return null; + RouteService service = ObserveSwingApplicationContext.get().newService(RouteService.class); + ReferenceSetDto<RouteStubDto> routeByTripSeine = service.getRouteByTripSeine(bean.getId()); + + if (log.isDebugEnabled()) { + log.debug("Will use " + routeByTripSeine.sizeReference() + " routes."); + } + + return new ArrayList<>(routeByTripSeine.getReference()); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java index 388068d..2dcd5a4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -21,16 +21,21 @@ */ package fr.ird.observe.ui.content.list.impl.seine; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineStubDto; +import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -88,19 +93,15 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe @Override protected List<ReferenceDto> getChilds(ProgramDto bean) { - //FIXME -// DataSource source = getDataSource(); -// DataService dataService = getDataService(); -// -// List<TripSeine> list = dataService.getTripSeineStubByProgram(source, bean.getTopiaId()); -// -// if (log.isDebugEnabled()) { -// log.debug("Will use " + list.size() + " trips."); -// } -// -// return list; - - return null; - + + TripSeineService service = ObserveSwingApplicationContext.get().newService(TripSeineService.class); + ReferenceSetDto<TripSeineStubDto> tripSeineByProgram = service.getTripSeineByProgram(bean.getId()); + + if (log.isDebugEnabled()) { + log.debug("Will use " + tripSeineByProgram.sizeReference() + " trips."); + } + + return new ArrayList<>(tripSeineByProgram.getReference()); + } } 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 10d8c27..cefa9dc 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,13 +24,12 @@ 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.ReferenceSetDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.service.longline.ActivityLonglineService; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -41,7 +40,7 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override - public List<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId) { + public ReferenceSetDto<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId) { return service.getActivityLonglineStubByRoute(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 a3dc624..52ede2b 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,12 +24,11 @@ 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.ReferenceSetDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.service.longline.TripLonglineService; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -40,7 +39,7 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public List<TripLonglineStubDto> getTripLonglineStubByProgram(String programId) { + public ReferenceSetDto<TripLonglineStubDto> getTripLonglineStubByProgram(String programId) { return service.getTripLonglineStubByProgram(programId); } 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 7c0d960..263fba8 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,12 +24,11 @@ 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.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.service.seine.ActivitySeineService; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -40,7 +39,7 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override - public List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { + public ReferenceSetDto<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { return service.getActivitySeineStubByRoute(routeId); } 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 4b65180..fa69e04 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,13 +24,12 @@ 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.ReferenceSetDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.service.seine.RouteService; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -41,7 +40,7 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override - public List<RouteStubDto> getRouteByTripSeine(String tripSeineId) { + public ReferenceSetDto<RouteStubDto> getRouteByTripSeine(String tripSeineId) { return service.getRouteByTripSeine(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 e346f06..749e6f4 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,12 +24,11 @@ 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.ReferenceSetDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.seine.TripSeineService; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -40,7 +39,7 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public List<TripSeineStubDto> getTripSeineByProgram(String programId) { + public ReferenceSetDto<TripSeineStubDto> getTripSeineByProgram(String programId) { return service.getTripSeineByProgram(programId); } 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 14812b8..0889ff9 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.ReferenceSetDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; @@ -33,15 +34,13 @@ import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface ActivityLonglineService extends ObserveService { @ReadDataPermission - List<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId); + ReferenceSetDto<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId); @ReadDataPermission FormDto<ActivityLonglineDto> loadToRead(String activityLonglineId); 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 1cf2937..be7c753 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.ReferenceSetDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.spi.DeleteRequest; @@ -32,15 +33,13 @@ import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface TripLonglineService extends ObserveService { @ReadDataPermission - List<TripLonglineStubDto> getTripLonglineStubByProgram(String programId); + ReferenceSetDto<TripLonglineStubDto> getTripLonglineStubByProgram(String programId); @ReadDataPermission FormDto<TripLonglineDto> loadToRead(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 cb6549d..a7c1337 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.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.spi.DeleteRequest; @@ -32,15 +33,13 @@ import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface ActivitySeineService extends ObserveService { @ReadDataPermission - List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId); + ReferenceSetDto<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId); @ReadDataPermission FormDto<ActivitySeineDto> loadToRead(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 0c53283..242c630 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.ReferenceSetDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteStubDto; @@ -33,15 +34,13 @@ import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface RouteService extends ObserveService { @ReadDataPermission - List<RouteStubDto> getRouteByTripSeine(String tripSeineId); + ReferenceSetDto<RouteStubDto> getRouteByTripSeine(String tripSeineId); @ReadDataPermission FormDto<RouteDto> loadToRead(String routeId); 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 74707e9..10d0a82 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.ReferenceSetDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.spi.DeleteRequest; @@ -32,15 +33,13 @@ import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface TripSeineService extends ObserveService { @ReadDataPermission - List<TripSeineStubDto> getTripSeineByProgram(String programId); + ReferenceSetDto<TripSeineStubDto> getTripSeineByProgram(String programId); @ReadDataPermission FormDto<TripSeineDto> loadToRead(String tripSeineId); 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 b0e1928..a2291e9 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 @@ -22,14 +22,19 @@ package fr.ird.observe.services.service.longline; * #L% */ +import com.google.common.base.Optional; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; +import fr.ird.observe.entities.seine.ActivitySeine; 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.ReferenceSetDtos; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -39,7 +44,7 @@ import fr.ird.type.CoordinateHelper; import java.util.Calendar; import java.util.Date; -import java.util.List; +import java.util.LinkedHashSet; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -47,29 +52,26 @@ import java.util.List; public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements ActivityLonglineService { @Override - public List<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId) { + public ReferenceSetDto<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId) { ReferenceLocale referenceLocale = getReferenceLocale(); TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); - List<ActivityLonglineStubDto> stubs = Lists.newLinkedList(); + LinkedHashSet<ReferenceDto<ActivityLonglineStubDto>> stubs = Sets.newLinkedHashSet(); for (ActivityLongline activityLongline : tripLongline.getActivityLongline()) { - ActivityLonglineStubDto stub = new ActivityLonglineStubDto(); - - stub.setId(activityLongline.getTopiaId()); - - stub.setTimeStamp(activityLongline.getTimeStamp()); - - stub.setVesselActivityLonglineLabel(referenceLocale.getLabel(activityLongline.getVesselActivityLongline())); - - stub.setHasSetLongline(activityLongline.getSetLongline() != null); + ReferenceDto<ActivityLonglineStubDto> stub = entityToReferenceDto(ActivityLonglineStubDto.class, activityLongline); + stubs.add(stub); } - return stubs; + Optional<Date> lastUpdateOptional = getLastUpdate(ActivitySeine.class); + ReferenceSetDto<ActivityLonglineStubDto> stubReferences = + ReferenceSetDtos.newReferenceSetDto(ActivityLonglineStubDto.class, stubs, lastUpdateOptional.orNull()); + + return stubReferences; } 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 23e3de1..50a70f8 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 @@ -22,13 +22,17 @@ package fr.ird.observe.services.service.longline; * #L% */ -import com.google.common.collect.Lists; +import com.google.common.base.Optional; +import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; import fr.ird.observe.entities.referentiel.Program; 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.ReferenceSetDtos; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.dto.referential.ProgramDto; @@ -36,6 +40,7 @@ import org.nuiton.util.DateUtil; import java.util.Collections; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; /** @@ -48,28 +53,26 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override - public List<TripLonglineStubDto> getTripLonglineStubByProgram(String programId) { + public ReferenceSetDto<TripLonglineStubDto> getTripLonglineStubByProgram(String programId) { ReferenceLocale referenceLocale = getReferenceLocale(); List<TripLongline> tripLonglines = getDao().findAllStubByProgramId(programId, referenceLocale); - List<TripLonglineStubDto> stubs = Lists.newLinkedList(); + LinkedHashSet<ReferenceDto<TripLonglineStubDto>> stubs = Sets.newLinkedHashSet(); for (TripLongline tripLongline : tripLonglines) { - TripLonglineStubDto stub = new TripLonglineStubDto(); - stub.setId(tripLongline.getTopiaId()); - stub.setStartDate(tripLongline.getStartDate()); - stub.setEndDate(tripLongline.getEndDate()); - stub.setVesselLabel(referenceLocale.getLabel(tripLongline.getVessel())); - stub.setObserverLabel(tripLongline.getObserverLabel()); - + ReferenceDto<TripLonglineStubDto> stub = entityToReferenceDto(TripLonglineStubDto.class, tripLongline); stubs.add(stub); } - return stubs; + Optional<Date> lastUpdateOptional = getLastUpdate(TripLongline.class); + ReferenceSetDto<TripLonglineStubDto> stubReferences = + ReferenceSetDtos.newReferenceSetDto(TripLonglineStubDto.class, stubs, lastUpdateOptional.orNull()); + + return stubReferences; } @Override 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 4c286b4..9e730e8 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 @@ -22,14 +22,17 @@ package fr.ird.observe.services.service.seine; * #L% */ +import com.google.common.base.Optional; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import fr.ird.observe.entities.constants.ReferenceLocale; +import com.google.common.collect.Sets; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; 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.ReferenceSetDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; @@ -38,7 +41,7 @@ import fr.ird.type.CoordinateHelper; import org.nuiton.util.DateUtil; import java.util.Date; -import java.util.List; +import java.util.LinkedHashSet; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -47,25 +50,24 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override - public List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { - - ReferenceLocale referenceLocale = getReferenceLocale(); + public ReferenceSetDto<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { Route route = loadEntity(RouteDto.class, Route.class, routeId); - List<ActivitySeineStubDto> stubs = Lists.newLinkedList(); + LinkedHashSet<ReferenceDto<ActivitySeineStubDto>> stubs = Sets.newLinkedHashSet(); for (ActivitySeine activitySeine : route.getActivitySeine()) { - ActivitySeineStubDto stub = new ActivitySeineStubDto(); - stub.setId(activitySeine.getTopiaId()); - stub.setTime(activitySeine.getTime()); - stub.setVesselActivitySeineLabel(referenceLocale.getLabel(activitySeine.getVesselActivitySeine())); - stub.setHasSetSeine(activitySeine.getSetSeine() != null); + ReferenceDto<ActivitySeineStubDto> stub = entityToReferenceDto(ActivitySeineStubDto.class, activitySeine); + stubs.add(stub); } - return stubs; + Optional<Date> lastUpdateOptional = getLastUpdate(ActivitySeine.class); + ReferenceSetDto<ActivitySeineStubDto> stubReferences = + ReferenceSetDtos.newReferenceSetDto(ActivitySeineStubDto.class, stubs, lastUpdateOptional.orNull()); + + return stubReferences; } @Override 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 c352c86..d80de13 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 @@ -22,14 +22,19 @@ package fr.ird.observe.services.service.seine; * #L% */ +import com.google.common.base.Optional; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.RouteTopiaDao; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineTopiaDao; 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.ReferenceSetDtos; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteStubDto; @@ -39,7 +44,7 @@ import org.apache.commons.lang3.time.DateUtils; import org.nuiton.util.DateUtil; import java.util.Date; -import java.util.List; +import java.util.LinkedHashSet; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -47,23 +52,24 @@ import java.util.List; public class RouteServiceTopia extends ObserveServiceTopia implements RouteService { @Override - public List<RouteStubDto> getRouteByTripSeine(String tripSeineId) { + public ReferenceSetDto<RouteStubDto> getRouteByTripSeine(String tripSeineId) { TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); - List<RouteStubDto> stubs = Lists.newLinkedList(); + LinkedHashSet<ReferenceDto<RouteStubDto>> stubs = Sets.newLinkedHashSet(); for (Route route : tripSeine.getRoute()) { - RouteStubDto stub = new RouteStubDto(); - stub.setId(route.getTopiaId()); - stub.setDate(route.getDate()); - + ReferenceDto<RouteStubDto> stub = entityToReferenceDto(RouteStubDto.class, route); stubs.add(stub); } - return stubs; + Optional<Date> lastUpdateOptional = getLastUpdate(ActivitySeine.class); + ReferenceSetDto<RouteStubDto> stubReferences = + ReferenceSetDtos.newReferenceSetDto(RouteStubDto.class, stubs, lastUpdateOptional.orNull()); + + return stubReferences; } 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 525c082..41c8980 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 @@ -22,13 +22,17 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.Lists; +import com.google.common.base.Optional; +import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineTopiaDao; 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.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; @@ -36,6 +40,7 @@ import org.nuiton.util.DateUtil; import java.util.Collections; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; /** @@ -48,7 +53,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override - public List<TripSeineStubDto> getTripSeineByProgram(String programId) { + public ReferenceSetDto<TripSeineStubDto> getTripSeineByProgram(String programId) { ReferenceLocale referenceLocale = getReferenceLocale(); @@ -57,22 +62,20 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe List<TripSeine> tripSeines = getDao().findAllStubByProgramId(programId, referenceLocale); - List<TripSeineStubDto> stubs = Lists.newLinkedList(); + LinkedHashSet<ReferenceDto<TripSeineStubDto>> stubs = Sets.newLinkedHashSet(); for (TripSeine tripSeine : tripSeines) { - TripSeineStubDto stub = new TripSeineStubDto(); - stub.setId(tripSeine.getTopiaId()); - stub.setStartDate(tripSeine.getStartDate()); - stub.setEndDate(tripSeine.getEndDate()); - stub.setVesselLabel(referenceLocale.getLabel(tripSeine.getVessel())); - stub.setObserverLabel(tripSeine.getObserverLabel()); - + ReferenceDto<TripSeineStubDto> stub = entityToReferenceDto(TripSeineStubDto.class, tripSeine); stubs.add(stub); } - return stubs; + Optional<Date> lastUpdateOptional = getLastUpdate(TripSeine.class); + ReferenceSetDto<TripSeineStubDto> stubReferences = + ReferenceSetDtos.newReferenceSetDto(TripSeineStubDto.class, stubs, lastUpdateOptional.orNull()); + + return stubReferences; } @Override -- 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