[Observe-commits] 18/69: refactor save action for seine

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7017 in repository observe. See http://git.codelutin.com/observe.git commit c98c3c3387e40c9dfaa5b777e56cdef36a00ad83 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Apr 27 15:40:56 2015 +0200 refactor save action for seine Conflicts: observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java --- .../services/data/seine/ActivitySeineService.java | 2 +- .../data/seine/ActivitySeineServiceImpl.java | 60 ++++++-------- .../services/data/seine/FloatingObjectService.java | 2 +- .../data/seine/FloatingObjectServiceImpl.java | 47 ++++------- .../observe/services/data/seine/RouteService.java | 2 +- .../services/data/seine/RouteServiceImpl.java | 92 +++++++++------------- .../services/data/seine/SetSeineService.java | 2 +- .../services/data/seine/SetSeineServiceImpl.java | 51 +++++------- .../impl/seine/FloatingObjectUIHandler.java | 4 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 4 +- .../open/impl/seine/ActivitySeineUIHandler.java | 10 +-- .../ui/content/open/impl/seine/RouteUIHandler.java | 4 +- 12 files changed, 109 insertions(+), 171 deletions(-) diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineService.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineService.java index 113d897..6278b0b 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineService.java @@ -31,7 +31,7 @@ public interface ActivitySeineService extends ObserveService { ActivitySeine preCreate(String tripLonglineId); @Commit - ActivitySeine save(String routeId, ActivitySeine toSave); + String save(String routeId, ActivitySeine toSave); @Commit ActivitySeine updateObservedSystem(ActivitySeine toUpdate); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java index 5fe7977..59e4265 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java @@ -159,24 +159,36 @@ public class ActivitySeineServiceImpl extends AbstractObserveService implements } + @Override - public ActivitySeine save(String routeId, ActivitySeine toSave) { + public String save(String routeId, ActivitySeine toSave) { + String activitySeineId = doSave(routeId, toSave, new SaveAction<Route, ActivitySeine>(Route.class, ActivitySeine.class) { - ActivitySeine saved; + @Override + public ActivitySeine onCreate(Route parent, ActivitySeine toCreate) { - if (toSave.getTopiaId() == null) { + ActivitySeine created = getDao().create(); + getBinderForEdit().copy(toCreate, created); - // create - saved = create(routeId, toSave); + parent.addActivitySeine(created); + return created; + } - } else { + @Override + public ActivitySeine onUpdate(Route parent, ActivitySeine toUpdate, ActivitySeine updated) { + Date d = DateUtil.getDateAndTime(parent.getDate(), toUpdate.getTime(), false, false); - // update - saved = update(routeId, toSave); + toUpdate.setTime(d); - } + getBinderForEdit().copyExcluding(toUpdate, updated, + ActivitySeine.PROPERTY_OBSERVED_SYSTEM, + ActivitySeine.PROPERTY_FLOATING_OBJECT); - return saved; + return updated; + } + }); + + return activitySeineId; } @@ -276,34 +288,6 @@ public class ActivitySeineServiceImpl extends AbstractObserveService implements } - protected ActivitySeine create(String routeId, ActivitySeine toCreate) { - - ActivitySeineDAO dao = getDao(); - ActivitySeine created = dao.create(toCreate); - - Route route = findByTopiaId(Route.class, routeId); - route.addActivitySeine(created); - - return created; - - } - - protected ActivitySeine update(String routeId, ActivitySeine toUpdate) { - - Route route = findByTopiaId(Route.class, routeId); - Date d = DateUtil.getDateAndTime(route.getDate(), toUpdate.getTime(), false, false); - - toUpdate.setTime(d); - - ActivitySeineDAO dao = getDao(); - ActivitySeine updated = dao.findByTopiaId(toUpdate.getTopiaId()); - getBinderForEdit().copyExcluding(toUpdate, updated, - ActivitySeine.PROPERTY_OBSERVED_SYSTEM, - ActivitySeine.PROPERTY_FLOATING_OBJECT); - return updated; - - } - protected ActivitySeineDAO getDao() { return (ActivitySeineDAO) getDao(ActivitySeine.class); } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectService.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectService.java index 80e7225..c9dec98 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectService.java @@ -28,7 +28,7 @@ public interface FloatingObjectService extends ObserveService { FloatingObject preCreate(String activitySeineId); @Commit - FloatingObject save(String activitySeineId, FloatingObject toSave); + String save(String activitySeineId, FloatingObject toSave); @Commit FloatingObject updateTransmittingBuoyOperation(FloatingObject toUpdate); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java index ef466ec..f4e9fa4 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java @@ -71,23 +71,30 @@ public class FloatingObjectServiceImpl extends AbstractObserveService implements } @Override - public FloatingObject save(String activitySeineId, FloatingObject toSave) { + public String save(String activitySeineId, FloatingObject toSave) { - FloatingObject saved; + String floatingObjectId = doSave(activitySeineId, toSave, new SaveAction<ActivitySeine, FloatingObject>(ActivitySeine.class, FloatingObject.class) { - if (toSave.getTopiaId() == null) { + @Override + public FloatingObject onCreate(ActivitySeine parent, FloatingObject toCreate) { - // create - saved = create(activitySeineId, toSave); + FloatingObject created = getDao().create(); + getBinderForEdit().copy(toCreate, created); - } else { + parent.addFloatingObject(created); - // update - saved = update(toSave); + return created; - } + } + + @Override + public FloatingObject onUpdate(ActivitySeine parent, FloatingObject toUpdate, FloatingObject updated) { + copyForEdit(toUpdate, updated); + return updated; + } + }); - return saved; + return floatingObjectId; } @@ -247,26 +254,6 @@ public class FloatingObjectServiceImpl extends AbstractObserveService implements } - protected FloatingObject create(String activitySeineId, FloatingObject toCreate) { - - FloatingObjectDAO dao = getDao(); - FloatingObject created = dao.create(toCreate); - - ActivitySeine route = findByTopiaId(ActivitySeine.class, activitySeineId); - route.addFloatingObject(created); - - return created; - - } - - protected FloatingObject update(FloatingObject toUpdate) { - - FloatingObject updated = getDao().findByTopiaId(toUpdate.getTopiaId()); - copyForEdit(toUpdate, updated); - return updated; - - } - protected FloatingObjectDAO getDao() { return (FloatingObjectDAO) getDao(FloatingObject.class); } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteService.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteService.java index b968807..6dbd6ff 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteService.java @@ -27,7 +27,7 @@ public interface RouteService extends ObserveService { Route preCreate(String tripSeineId); @Commit - Route save(String tripSeineId, Route toSave); + String save(String tripSeineId, Route toSave); @Commit void delete(String tripSeineId, String routeId); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java index 0333785..a7f832b 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java @@ -97,27 +97,50 @@ public class RouteServiceImpl extends AbstractObserveService implements RouteSer } @Override - public Route save(String tripSeineId, Route toSave) { + public String save(String tripSeineId, Route toSave) { - Route saved; + String routeId = doSave(tripSeineId, toSave, new SaveAction<TripSeine, Route>(TripSeine.class, Route.class) { - // on sauvegarde toujours en debut de jour - Date date = DateUtil.getDay(toSave.getDate()); - toSave.setDate(date); + @Override + public Route onCreate(TripSeine parent, Route toCreate) { - if (toSave.getTopiaId() == null) { + Route created = getDao().create(); + getBinderForEdit().copy(toCreate, created); - // create - saved = create(tripSeineId, toSave); + parent.addRoute(created); - } else { + // on met a jour si necessaire la date de fin de la maree + parent.updateDateFin(); + + return created; + } - // update - saved = update(tripSeineId, toSave); + @Override + public Route onUpdate(TripSeine parent, Route toUpdate, Route updated) { - } + // on conserve l'ancienne date d'observation + Date oldDate = DateUtil.getDay(toUpdate.getDate()); + + // recopie des propriétés vers le bean a sauver + getBinderForEdit().copyExcluding(toUpdate, updated, Route.PROPERTY_ACTIVITY_SEINE); + + if (!oldDate.equals(toUpdate.getDate())) { + + //FIXME Faire cela avec une requete sql, sinon ca charge trop de données + // le jour a change, il faut mettre à jour les dates des activites et des calees + updated.updateDates(); + + } + + // on met a jour si necessaire la date de fin de la maree + parent.updateDateFin(); - return saved; + return updated; + + } + }); + + return routeId; } @@ -217,49 +240,6 @@ public class RouteServiceImpl extends AbstractObserveService implements RouteSer } - protected Route create(String tripSeineId, Route toCreate) { - - RouteDAO dao = getDao(); - Route created = dao.create(toCreate); - - TripSeine tripSeine = findByTopiaId(TripSeine.class, tripSeineId); - tripSeine.addRoute(created); - - // on met a jour si necessaire la date de fin de la maree - tripSeine.updateDateFin(); - - return created; - - } - - protected Route update(String tripSeineId, Route toUpdate) { - - RouteDAO dao = getDao(); - Route updated = dao.findByTopiaId(toUpdate.getTopiaId()); - - // on conserve l'ancienne date d'observation - Date oldDate = DateUtil.getDay(toUpdate.getDate()); - - // recopie des propriétés vers le bean a sauver - getBinderForEdit().copyExcluding(toUpdate, updated, Route.PROPERTY_ACTIVITY_SEINE); - - if (!oldDate.equals(toUpdate.getDate())) { - - //FIXME Faire cela avec une requete sql, sinon ca charge trop de données - // le jour a change, il faut mettre à jour les dates des activites et des calees - updated.updateDates(); - - } - - TripSeine tripSeine = findByTopiaId(TripSeine.class, tripSeineId); - - // on met a jour si necessaire la date de fin de la maree - tripSeine.updateDateFin(); - - return updated; - - } - protected RouteDAO getDao() { return (RouteDAO) getDao(Route.class); } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineService.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineService.java index b646c2e..9d86f50 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineService.java @@ -25,7 +25,7 @@ public interface SetSeineService extends ObserveService { SetSeine preCreate(String routeId, String activitySeineId); @Commit - SetSeine save(String activitySeineId, SetSeine toSave); + String save(String activitySeineId, SetSeine toSave); @Commit void delete(String activitySeineId, String setSeineId); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java index e012079..cc31a3d 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java @@ -93,24 +93,33 @@ public class SetSeineServiceImpl extends AbstractObserveService implements SetSe } @Override - public SetSeine save(String activitySeineId, SetSeine toSave) { + public String save(String activitySeineId, SetSeine toSave) { - SetSeine saved; + String setSeineId = doSave(activitySeineId, toSave, new SaveAction<ActivitySeine, SetSeine>(ActivitySeine.class, SetSeine.class) { - if (toSave.getTopiaId() == null) { + @Override + public SetSeine onCreate(ActivitySeine parent, SetSeine toCreate) { - // create - saved = create(activitySeineId, toSave); + SetSeine created = getDao().create(); + getBinderForEdit().copy(toCreate, created); - } else { + parent.setSetSeine(created); - // update - saved = update(toSave); + return created; + } - } + @Override + public SetSeine onUpdate(ActivitySeine parent, SetSeine toUpdate, SetSeine updated) { - return saved; + getBinderForEdit().copyExcluding(toUpdate, updated, + SetSeine.PROPERTY_TARGET_SAMPLE, + SetSeine.PROPERTY_NON_TARGET_SAMPLE); + return updated; + } + }); + + return setSeineId; } @@ -181,26 +190,4 @@ public class SetSeineServiceImpl extends AbstractObserveService implements SetSe return (SetSeineDAO) getDao(SetSeine.class); } - protected SetSeine create(String activitySeineId, SetSeine toCreate) { - - SetSeineDAO dao = getDao(); - SetSeine created = dao.create(toCreate); - - ActivitySeine activitySeine = findByTopiaId(ActivitySeine.class, activitySeineId); - activitySeine.setSetSeine(created); - - return created; - - } - - protected SetSeine update(SetSeine toUpdate) { - - SetSeine updated = getDao().findByTopiaId(toUpdate.getTopiaId()); - getBinderForEdit().copyExcluding(toUpdate, updated, - SetSeine.PROPERTY_TARGET_SAMPLE, - SetSeine.PROPERTY_NON_TARGET_SAMPLE); - return updated; - - } - } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java index 0ef7e26..cec5c6c 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -162,8 +162,8 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObject> { String activityId = getSelectedParentId(); FloatingObjectService service = getService(FloatingObjectService.class); - FloatingObject saved = service.save(activityId, bean); - service.copyForEdit(saved, bean); + String savedId = service.save(activityId, bean); + bean.setTopiaId(savedId); return true; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java index 4bb3643..904c177 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java @@ -242,8 +242,8 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeine> { String activityId = getSelectedParentId(); SetSeineService service = getService(SetSeineService.class); - SetSeine saved = service.save(activityId, bean); - bean.setTopiaId(saved.getTopiaId()); + String savedId = service.save(activityId, bean); + bean.setTopiaId(savedId); return true; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java index 9641102..10cf6ab 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -218,9 +218,9 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei t("observe.activitySeine.message.creating")); } else { addMessage(ui, - NuitonValidatorScope.INFO, - getEntityLabel(ActivitySeine.class), - t("observe.activitySeine.message.updating")); + NuitonValidatorScope.INFO, + getEntityLabel(ActivitySeine.class), + t("observe.activitySeine.message.updating")); } super.startEditUI(ActivitySeineUI.BINDING_TIME_TIME, @@ -250,8 +250,8 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei bean.setOpen(true); ActivitySeineService service = getService(ActivitySeineService.class); - ActivitySeine saved = service.save(routeId, bean); - bean.setTopiaId(saved.getTopiaId()); + String savedId = service.save(routeId, bean); + bean.setTopiaId(savedId); obtainChildPosition(bean); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java index 6bbbcc9..5f58080 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java @@ -203,8 +203,8 @@ public class RouteUIHandler extends ContentOpenableUIHandler<Route> { bean.setOpen(true); RouteService service = getService(RouteService.class); - Route saved = service.save(tripId, bean); - bean.setTopiaId(saved.getTopiaId()); + String savedId = service.save(tripId, bean); + bean.setTopiaId(savedId); obtainChildPosition(bean); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.