branch feature/7458 updated (a5f7ff9 -> ccd5a13)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7458 in repository observe. See http://git.codelutin.com/observe.git from a5f7ff9 Renommage Label en Reference, introduction de Reference ReferentialReference new ccd5a13 add seine services dto (refs #7458). 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 ccd5a13386d0597c618c43ed9a168aad0f6fbf34 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Aug 18 18:09:29 2015 +0200 add seine services dto (refs #7458). Summary of changes: .../seine/ActivitySeineObservedSystemService.java | 3 +- .../service/seine/ActivitySeineService.java | 9 ++--- .../service/seine/FloatingObjectService.java | 30 ++++++++++++++ .../service/seine/GearUseFeaturesSeineService.java | 30 ++++++++++++++ ...vice.java => ObjectObservedSpeciesService.java} | 8 +++- .../service/seine/ObjectSchoolEstimateService.java | 29 +++++++++++++ .../seine/TransmittingBuoyOperationService.java | 30 ++++++++++++++ .../services/service/seine/TripSeineService.java | 30 ++++++++++++++ .../src/main/xmi/observe-services-dto-seine.zargo | Bin 55982 -> 55090 bytes .../service/seine/ActivitySeineServiceTopia.java | 10 ++--- .../service/seine/FloatingObjectServiceTopia.java | 45 +++++++++++++++++++++ 11 files changed, 208 insertions(+), 16 deletions(-) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java copy observe-services-api/src/main/java/fr/ird/observe/services/service/seine/{ActivitySeineObservedSystemService.java => ObjectObservedSpeciesService.java} (60%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java -- 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/7458 in repository observe. See http://git.codelutin.com/observe.git commit ccd5a13386d0597c618c43ed9a168aad0f6fbf34 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Aug 18 18:09:29 2015 +0200 add seine services dto (refs #7458). --- .../seine/ActivitySeineObservedSystemService.java | 3 +- .../service/seine/ActivitySeineService.java | 9 ++--- .../service/seine/FloatingObjectService.java | 30 ++++++++++++++ .../service/seine/GearUseFeaturesSeineService.java | 30 ++++++++++++++ ...vice.java => ObjectObservedSpeciesService.java} | 8 +++- .../service/seine/ObjectSchoolEstimateService.java | 29 +++++++++++++ .../seine/TransmittingBuoyOperationService.java | 30 ++++++++++++++ .../services/service/seine/TripSeineService.java | 30 ++++++++++++++ .../src/main/xmi/observe-services-dto-seine.zargo | Bin 55982 -> 55090 bytes .../service/seine/ActivitySeineServiceTopia.java | 10 ++--- .../service/seine/FloatingObjectServiceTopia.java | 45 +++++++++++++++++++++ 11 files changed, 208 insertions(+), 16 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java index c9ee23e..20c4b33 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java @@ -1,5 +1,6 @@ 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.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.spi.Write; @@ -7,7 +8,7 @@ import fr.ird.observe.services.spi.Write; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public interface ActivitySeineObservedSystemService { +public interface ActivitySeineObservedSystemService extends ObserveService { FormDto<ActivitySeineObservedSystemDto> loadToRead(String activitySeineId); 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 9c46a5e..26368d5 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 @@ -2,20 +2,20 @@ 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.ActivitySeineDto; import fr.ird.observe.services.spi.Write; -import java.util.Collection; import java.util.List; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public interface ActivitySeineService extends ObserveService { +public interface ActivitySeineService extends ObserveService { FormDto<ActivitySeineDto> loadToRead(String activitySeineId); - List<ActivitySeineDto> getActivitySeineStubByRoute(String routeId); + List<ReferenceDto<ActivitySeineDto>> getActivitySeineByRoute(String routeId); FormDto<ActivitySeineDto> loadToEdit(String activitySeineId); @@ -26,7 +26,4 @@ public interface ActivitySeineService extends ObserveService { @Write void delete(String routeId, String activitySeineId); - - @Write - void delete(String routeId, Collection<String> activitySeineIds); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java new file mode 100644 index 0000000..05c7036 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java @@ -0,0 +1,30 @@ +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.FloatingObjectDto; +import fr.ird.observe.services.spi.Write; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public interface FloatingObjectService extends ObserveService { + + FormDto<FloatingObjectDto> loadToRead(String floatingObjectId); + + List<ReferenceDto<FloatingObjectDto>> getFloatingObjectByActivitySeine(String activitySeineId); + + FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId); + + FormDto<FloatingObjectDto> preCreate(String activitySeineId); + + @Write + String save(FormDto<FloatingObjectDto> form); + + @Write + void delete(String activitySeineId, String floatingObjectId); + +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java new file mode 100644 index 0000000..b69e076 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java @@ -0,0 +1,30 @@ +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.seine.GearUseFeaturesSeineDto; +import fr.ird.observe.services.spi.Write; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public interface GearUseFeaturesSeineService extends ObserveService { + + List<GearUseFeaturesSeineDto> getGearUseFeaturesSeineByTripSeine(String tripSeineId); + + FormDto<GearUseFeaturesSeineDto> loadToRead(String gearUseFeaturesSeineId); + + FormDto<GearUseFeaturesSeineDto> loadToEdit(String gearUseFeaturesSeineId); + + FormDto<GearUseFeaturesSeineDto> preCreate(String tripSeineId); + + @Write + String save(FormDto<GearUseFeaturesSeineDto> form); + + @Write + void delete(String tripSeineId, String gearUseFeaturesSeineId); + + +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java similarity index 60% copy from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java copy to observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java index c9ee23e..72e59b4 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java @@ -1,15 +1,19 @@ 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.seine.ActivitySeineObservedSystemDto; +import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import fr.ird.observe.services.spi.Write; +import java.util.List; + /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public interface ActivitySeineObservedSystemService { +public interface ObjectObservedSpeciesService extends ObserveService { - FormDto<ActivitySeineObservedSystemDto> loadToRead(String activitySeineId); + List<ObjectObservedSpeciesDto> loadToRead(String activitySeineId); FormDto<ActivitySeineObservedSystemDto> loadToEdit(String activitySeineId); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java new file mode 100644 index 0000000..a576c90 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java @@ -0,0 +1,29 @@ +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.ObjectSchoolEstimateDto; +import fr.ird.observe.services.spi.Write; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public interface ObjectSchoolEstimateService extends ObserveService { + + FormDto<ObjectSchoolEstimateDto> loadToRead(String objectSchoolEstimateId); + + List<ReferenceDto<ObjectSchoolEstimateDto>> getObjectSchoolEstimateByFloatingObject(String floatingObjectId); + + FormDto<ObjectSchoolEstimateDto> loadToEdit(String objectSchoolEstimateId); + + FormDto<ObjectSchoolEstimateDto> preCreate(String floatingObjectId); + + @Write + String save(FormDto<ObjectSchoolEstimateDto> form); + + @Write + void delete(String FloatingObjectId, String objectSchoolEstimateId); +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java new file mode 100644 index 0000000..96ff8b3 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java @@ -0,0 +1,30 @@ +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.referential.seine.TransmittingBuoyOperationDto; +import fr.ird.observe.services.spi.Write; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public interface TransmittingBuoyOperationService extends ObserveService { + + FormDto<TransmittingBuoyOperationDto> loadToRead(String transmittingBuoyOperationId); + + List<ReferenceDto<TransmittingBuoyOperationDto>> getTransmittingBuoyOperationByFloatingObject(String floatingObjectId); + + FormDto<TransmittingBuoyOperationDto> loadToEdit(String transmittingBuoyOperationId); + + FormDto<TransmittingBuoyOperationDto> preCreate(String floatingObjectId); + + @Write + String save(FormDto<TransmittingBuoyOperationDto> form); + + @Write + void delete(String FloatingObjectId, String activitySeineId); + +} 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 new file mode 100644 index 0000000..ec204d9 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java @@ -0,0 +1,30 @@ +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.TripSeineDto; +import fr.ird.observe.services.spi.Write; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public interface TripSeineService extends ObserveService { + + List<ReferenceDto<TripSeineDto>> getTripSeineByProgram(String programId); + + FormDto<TripSeineDto> loadToRead(String tripSeineId); + + FormDto<TripSeineDto> loadToEdit(String tripSeineId); + + FormDto<TripSeineDto> preCreate(String programId); + + @Write + String save(FormDto<TripSeineDto> form); + + @Write + void delete(String tripSeineId); + +} \ No newline at end of file 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 ac68371..7126c8e 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/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index 0e8bbab..048309a 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 @@ -2,9 +2,9 @@ package fr.ird.observe.services.service.seine; 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 java.util.Collection; import java.util.List; /** @@ -12,13 +12,14 @@ import java.util.List; */ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements ActivitySeineService { + @Override public FormDto<ActivitySeineDto> loadToRead(String activitySeineId) { return null; } @Override - public List<ActivitySeineDto> getActivitySeineStubByRoute(String routeId) { + public List<ReferenceDto<ActivitySeineDto>> getActivitySeineByRoute(String routeId) { return null; } @@ -41,9 +42,4 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac public void delete(String routeId, String activitySeineId) { } - - @Override - public void delete(String routeId, Collection<String> activitySeineIds) { - - } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java new file mode 100644 index 0000000..8e3702e --- /dev/null +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java @@ -0,0 +1,45 @@ +package fr.ird.observe.services.service.seine; + +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.FloatingObjectDto; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class FloatingObjectServiceTopia extends ObserveServiceTopia implements FloatingObjectService{ + + + @Override + public FormDto<FloatingObjectDto> loadToRead(String floatingObjectId) { + return null; + } + + @Override + public List<ReferenceDto<FloatingObjectDto>> getFloatingObjectByActivitySeine(String activitySeineId) { + return null; + } + + @Override + public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { + return null; + } + + @Override + public FormDto<FloatingObjectDto> preCreate(String activitySeineId) { + return null; + } + + @Override + public String save(FormDto<FloatingObjectDto> form) { + return null; + } + + @Override + public void delete(String activitySeineId, String floatingObjectId) { + + } +} -- 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