This is an automated email from the git hooks/post-receive script. New commit to branch feature/7520 in repository observe. See http://git.codelutin.com/observe.git commit 35481cc6bcb3471ad7eb800162cf39ffc63f74ce Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Sep 11 10:21:39 2015 +0200 ajout de la date de mise a jour dans les DTO (refs #7470 #7520) --- .../observe/services/dto/FollowedUpdateDto.java | 14 +++++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 33934 -> 35328 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 59030 -> 61407 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 56972 -> 59029 bytes .../services/dto/ObserveDtosInitializer.java | 57 ++++++++++++++------- .../service/seine/TripSeineServiceTopiaTest.java | 6 +++ 6 files changed, 58 insertions(+), 19 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FollowedUpdateDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FollowedUpdateDto.java new file mode 100644 index 0000000..f304477 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FollowedUpdateDto.java @@ -0,0 +1,14 @@ +package fr.ird.observe.services.dto; + +import java.util.Date; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public interface FollowedUpdateDto { + + Date getLastUpdate(); + + void setLastUpdate(Date lastUpdate); + +} diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index fa18225..59c5da7 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo index cf43c27..76b9e29 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index 246caa6..e714dbb 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java index 987d3bd..b914890 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java @@ -247,7 +247,8 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { ReferentialDto.PROPERTY_CODE, ReferentialDto.PROPERTY_URI, ReferentialDto.PROPERTY_STATUS, - ReferentialDto.PROPERTY_NEED_COMMENT + ReferentialDto.PROPERTY_NEED_COMMENT, + ReferentialDto.PROPERTY_LAST_UPDATE }; protected final static String[] DEFAULT_REFERENTIAL_LENGTH_WEIGHT_PARAMETER_PROPERTIES = { @@ -274,7 +275,8 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { I18nReferentialDto.PROPERTY_LABEL8 }; - private static final String[] DEFAULT_REFERENTIAL_REFERENCE_PROPERTIES = {ReferentialDto.PROPERTY_CODE, I18nReferentialDto.PROPERTY_LABEL1, I18nReferentialDto.PROPERTY_LABEL2, I18nReferentialDto.PROPERTY_LABEL3}; + private static final String[] DEFAULT_REFERENTIAL_REFERENCE_PROPERTIES = {ReferentialDto.PROPERTY_CODE, I18nReferentialDto.PROPERTY_LABEL1, I18nReferentialDto.PROPERTY_LABEL2, I18nReferentialDto.PROPERTY_LABEL3, + ReferentialDto.PROPERTY_LAST_UPDATE}; // { // // Need to add by hand a speciesList binder @@ -359,7 +361,8 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { ActivityLonglineDto.PROPERTY_LONGITUDE, ActivityLonglineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, - ActivityLonglineDto.PROPERTY_FPA_ZONE + ActivityLonglineDto.PROPERTY_FPA_ZONE, + ActivityLonglineDto.PROPERTY_LAST_UPDATE ); } @@ -367,7 +370,8 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { public void initActivityLonglineEncouterDto() { registerDto(ActivityLonglineEncouterDto.class, ActivityLongline.class, ActivityLonglineEncouterDto.PROPERTY_COMMENT, - ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER + ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER, + ActivityLonglineEncouterDto.PROPERTY_LAST_UPDATE ); } @@ -375,7 +379,8 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { public void initActivityLonglineSensorUsedDto() { registerDto(ActivityLonglineSensorUsedDto.class, ActivityLongline.class, ActivityLonglineSensorUsedDto.PROPERTY_COMMENT, - ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED + ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED, + ActivityLonglineSensorUsedDto.PROPERTY_LAST_UPDATE ); } @@ -584,21 +589,24 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { SetLonglineDto.PROPERTY_LINE_TYPE, SetLonglineDto.PROPERTY_LIGHTSTICKS_COLOR, SetLonglineDto.PROPERTY_LIGHTSTICKS_TYPE, - SetLonglineDto.PROPERTY_SETTING_SHAPE + SetLonglineDto.PROPERTY_SETTING_SHAPE, + SetLonglineDto.PROPERTY_LAST_UPDATE ); } @Override public void initSetLonglineCatchDto() { registerDto(SetLonglineCatchDto.class, SetLongline.class, - SetLonglineCatchDto.PROPERTY_CATCH_LONGLINE + SetLonglineCatchDto.PROPERTY_CATCH_LONGLINE, + SetLonglineCatchDto.PROPERTY_LAST_UPDATE ); } @Override public void initSetLonglineDetailCompositionDto() { registerDto(SetLonglineDetailCompositionDto.class, SetLongline.class, - SetLonglineDetailCompositionDto.PROPERTY_SECTION + SetLonglineDetailCompositionDto.PROPERTY_SECTION, + SetLonglineDetailCompositionDto.PROPERTY_LAST_UPDATE ); } @@ -609,14 +617,16 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { SetLonglineGlobalCompositionDto.PROPERTY_BRANCHLINES_COMPOSITION, SetLonglineGlobalCompositionDto.PROPERTY_HOOKS_COMPOSITION, SetLonglineGlobalCompositionDto.PROPERTY_BAITS_COMPOSITION, - SetLonglineGlobalCompositionDto.PROPERTY_MITIGATION_TYPE + SetLonglineGlobalCompositionDto.PROPERTY_MITIGATION_TYPE, + SetLonglineGlobalCompositionDto.PROPERTY_LAST_UPDATE ); } @Override public void initSetLonglineTdrDto() { registerDto(SetLonglineTdrDto.class, SetLongline.class, - SetLonglineTdrDto.PROPERTY_TDR + SetLonglineTdrDto.PROPERTY_TDR, + SetLonglineTdrDto.PROPERTY_LAST_UPDATE ); } @@ -675,7 +685,8 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { TripLonglineDto.PROPERTY_VESSEL, TripLonglineDto.PROPERTY_OCEAN, TripLonglineDto.PROPERTY_DEPARTURE_HARBOUR, - TripLonglineDto.PROPERTY_LANDING_HARBOUR + TripLonglineDto.PROPERTY_LANDING_HARBOUR, + TripLonglineDto.PROPERTY_LAST_UPDATE ); } @@ -1280,7 +1291,8 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE, ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE, ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE, - ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE + ActivitySeineDto.PROPERTY_WIND, + ActivitySeineDto.PROPERTY_LAST_UPDATE ); } @@ -1290,7 +1302,8 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { registerDto(ActivitySeineObservedSystemDto.class, ActivitySeine.class, ActivitySeineObservedSystemDto.PROPERTY_COMMENT, ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE, - ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM + ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM, + ActivitySeineObservedSystemDto.PROPERTY_LAST_UPDATE ); } @@ -1424,7 +1437,8 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { RouteDto.PROPERTY_DATE, RouteDto.PROPERTY_START_LOG_VALUE, RouteDto.PROPERTY_END_LOG_VALUE, - RouteDto.PROPERTY_CHECK_LEVEL + RouteDto.PROPERTY_CHECK_LEVEL, + RouteDto.PROPERTY_LAST_UPDATE ); } @@ -1460,14 +1474,16 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { SetSeineDto.PROPERTY_NON_TARGET_DISCARDED, SetSeineDto.PROPERTY_CURRENT_MEASURE_DEPTH, SetSeineDto.PROPERTY_SCHOOL_TYPE, - SetSeineDto.PROPERTY_REASON_FOR_NULL_SET + SetSeineDto.PROPERTY_REASON_FOR_NULL_SET, + SetSeineDto.PROPERTY_LAST_UPDATE ); } @Override public void initSetSeineNonTargetCatchDto() { registerDto(SetSeineNonTargetCatchDto.class, SetSeine.class, - SetSeineNonTargetCatchDto.PROPERTY_NON_TARGET_CATCH + SetSeineNonTargetCatchDto.PROPERTY_NON_TARGET_CATCH, + ActivityLonglineDto.PROPERTY_LAST_UPDATE ); } @@ -1475,14 +1491,16 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { public void initSetSeineSchoolEstimateDto() { registerDto(SetSeineSchoolEstimateDto.class, SetSeine.class, SetSeineSchoolEstimateDto.PROPERTY_COMMENT, - SetSeineSchoolEstimateDto.PROPERTY_SCHOOL_ESTIMATE + SetSeineSchoolEstimateDto.PROPERTY_SCHOOL_ESTIMATE, + SetSeineSchoolEstimateDto.PROPERTY_LAST_UPDATE ); } @Override public void initSetSeineTargetCatchDto() { registerDto(SetSeineTargetCatchDto.class, SetSeine.class, - SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH + SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH, + SetSeineTargetCatchDto.PROPERTY_LAST_UPDATE ); } @@ -1552,7 +1570,8 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { TripSeineDto.PROPERTY_VESSEL, TripSeineDto.PROPERTY_OCEAN, TripSeineDto.PROPERTY_DEPARTURE_HARBOUR, - TripSeineDto.PROPERTY_LANDING_HARBOUR + TripSeineDto.PROPERTY_LANDING_HARBOUR, + TripSeineDto.PROPERTY_LAST_UPDATE ); registerReferenceBinder(TripSeineDto.class, TripSeine.class, diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index 150e6e6..13aea1b 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -139,6 +139,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeine.getFormsUrl(), tripSeineDto.getFormsUrl()); Assert.assertEquals(tripSeine.getReportsUrl(), tripSeineDto.getReportsUrl()); Assert.assertEquals(tripSeine.getComment(), tripSeineDto.getComment()); + Assert.assertEquals(tripSeine.getLastUpdate(), tripSeineDto.getLastUpdate()); Assert.assertNotNull(formDto.getLabels()); @@ -179,6 +180,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeine.getFormsUrl(), tripSeineDto.getFormsUrl()); Assert.assertEquals(tripSeine.getReportsUrl(), tripSeineDto.getReportsUrl()); Assert.assertEquals(tripSeine.getComment(), tripSeineDto.getComment()); + Assert.assertEquals(tripSeine.getLastUpdate(), tripSeineDto.getLastUpdate()); Assert.assertNotNull(formDto.getLabels()); @@ -217,6 +219,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertNull(tripSeineDto.getFormsUrl()); Assert.assertNull(tripSeineDto.getReportsUrl()); Assert.assertNull(tripSeineDto.getComment()); + Assert.assertNull(tripSeineDto.getLastUpdate()); Assert.assertNotNull(formDto.getLabels()); @@ -287,6 +290,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeineDto.getFormsUrl(), tripSeine.getFormsUrl()); Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeine.getReportsUrl()); Assert.assertEquals(tripSeineDto.getComment(), tripSeine.getComment()); + Assert.assertNotNull(tripSeine.getLastUpdate()); Date lastUpdateAfter = getLastUpdate(TripSeine.class); Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); @@ -342,6 +346,8 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeineDto.getFormsUrl(), tripSeine.getFormsUrl()); Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeine.getReportsUrl()); Assert.assertEquals(tripSeineDto.getComment(), tripSeine.getComment()); + Assert.assertNotNull(tripSeine.getLastUpdate()); + Assert.assertNotEquals(tripSeineDto.getLastUpdate(), tripSeine.getLastUpdate()); Date lastUpdateAfter = getLastUpdate(TripSeine.class); Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.