branch feature/refactor_reference updated (1577189 -> 4653914)
This is an automated email from the git hooks/post-receive script. New change to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git from 1577189 Avoid NPe + improve code new 4653914 ajout des définitions des requetes 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 4653914b70667d8b307b87fb57507c5120045761 Author: Kevin Morin <morin@codelutin.com> Date: Wed Nov 18 17:22:53 2015 +0100 ajout des définitions des requetes Summary of changes: .../definition/ObserveReferenceSetDefinitions.java | 2 +- .../ObserveReferenceSetRequestDefinitions.java | 90 +++++++++++++++++++++- 2 files changed, 90 insertions(+), 2 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/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit 4653914b70667d8b307b87fb57507c5120045761 Author: Kevin Morin <morin@codelutin.com> Date: Wed Nov 18 17:22:53 2015 +0100 ajout des définitions des requetes --- .../definition/ObserveReferenceSetDefinitions.java | 2 +- .../ObserveReferenceSetRequestDefinitions.java | 90 +++++++++++++++++++++- 2 files changed, 90 insertions(+), 2 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetDefinitions.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetDefinitions.java index 6e1f93b..e959ad7 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetDefinitions.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetDefinitions.java @@ -137,7 +137,7 @@ public enum ObserveReferenceSetDefinitions { BAIT_SETTING_STATUS(newDefaultDefinitionBuilder(BaitSettingStatusDto.class)), - BAITTYPE(newDefaultDefinitionBuilder(BaitTypeDto.class)), + BAIT_TYPE(newDefaultDefinitionBuilder(BaitTypeDto.class)), CATCH_FATE_LONGLINE(newDefaultDefinitionBuilder(CatchFateLonglineDto.class)), diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestDefinitions.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestDefinitions.java index e7e520f..67e81fb 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestDefinitions.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestDefinitions.java @@ -1,6 +1,15 @@ package fr.ird.observe.services.dto.reference.definition; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; /** @@ -12,6 +21,84 @@ import fr.ird.observe.services.dto.seine.TripSeineDto; */ public enum ObserveReferenceSetRequestDefinitions { + ACTIVITY_LONGLINE_FORM(newBuilder(ActivityLonglineDto.class) + .addKey(ActivityLonglineDto.PROPERTY_FPA_ZONE, + ObserveReferenceSetDefinitions.FPA_ZONE) + .addKey(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, + ObserveReferenceSetDefinitions.VESSEL_ACTIVITY_LONGLINE) + ), + + BRANCHLINE_FORM(newBuilder(BranchlineDto.class) + .addKey(BranchlineDto.PROPERTY_BAIT_SETTING_STATUS, ObserveReferenceSetDefinitions.BAIT_SETTING_STATUS) + .addKey(BranchlineDto.PROPERTY_HOOK_SIZE, ObserveReferenceSetDefinitions.HOOK_SIZE) + .addKey(BranchlineDto.PROPERTY_BAIT_HAULING_STATUS, ObserveReferenceSetDefinitions.BAIT_HAULING_STATUS) + .addKey(BranchlineDto.PROPERTY_HOOK_TYPE, ObserveReferenceSetDefinitions.HOOK_TYPE) + .addKey(BranchlineDto.PROPERTY_TRACELINE_TYPE, ObserveReferenceSetDefinitions.LINE_TYPE) + .addKey(BranchlineDto.PROPERTY_TOP_TYPE, ObserveReferenceSetDefinitions.LINE_TYPE) + .addKey(BranchlineDto.PROPERTY_BAIT_TYPE, ObserveReferenceSetDefinitions.BAIT_TYPE) + ), + + SET_LONGLINE_GLOBAL_COMPOSITION_FORM(newBuilder(SetLonglineGlobalCompositionDto.class) + .addKey(SetLonglineGlobalCompositionDto.PROPERTY_MITIGATION_TYPE, + ObserveReferenceSetDefinitions.MITIGATION_TYPE) + ), + + SET_LONGLINE_FORM(newBuilder(SetLonglineDto.class) + .addKey(SetLonglineDto.PROPERTY_SETTING_SHAPE, ObserveReferenceSetDefinitions.SETTING_SHAPE) + .addKey(SetLonglineDto.PROPERTY_LINE_TYPE, ObserveReferenceSetDefinitions.LINE_TYPE) + .addKey(SetLonglineDto.PROPERTY_LIGHTSTICKS_TYPE, ObserveReferenceSetDefinitions.LIGHTSTICKS_TYPE) + .addKey(SetLonglineDto.PROPERTY_LIGHTSTICKS_COLOR, ObserveReferenceSetDefinitions.LIGHTSTICKS_COLOR) + ), + + TRIP_LONGLINE_FORM(newBuilder(TripLonglineDto.class) + .addKey(TripLonglineDto.PROPERTY_TRIP_TYPE, ObserveReferenceSetDefinitions.TRIP_TYPE) + .addKey(TripLonglineDto.PROPERTY_OBSERVER, ObserveReferenceSetDefinitions.PERSON) + .addKey(TripLonglineDto.PROPERTY_VESSEL, ObserveReferenceSetDefinitions.VESSEL) + .addKey(TripLonglineDto.PROPERTY_CAPTAIN, ObserveReferenceSetDefinitions.PERSON) + .addKey(TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR, ObserveReferenceSetDefinitions.PERSON) + .addKey(TripLonglineDto.PROPERTY_PROGRAM, ObserveReferenceSetDefinitions.PROGRAM) + .addKey(TripLonglineDto.PROPERTY_OCEAN, ObserveReferenceSetDefinitions.OCEAN) + .addKey(TripLonglineDto.PROPERTY_DEPARTURE_HARBOUR, ObserveReferenceSetDefinitions.HARBOUR) + .addKey(TripLonglineDto.PROPERTY_LANDING_HARBOUR, ObserveReferenceSetDefinitions.HARBOUR) + ), + + ACTIVITY_SEINE_OBSERVED_SYSTEM_FORM(newBuilder(ActivitySeineObservedSystemDto.class) + .addKey(ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM, + ObserveReferenceSetDefinitions.OBSERVED_SYSTEM) + ), + + ACTIVITY_SEINE_FORM(newBuilder(ActivitySeineDto.class) + .addKey(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, + ObserveReferenceSetDefinitions.VESSEL_ACTIVITY_SEINE) + .addKey(ActivitySeineDto.PROPERTY_SURROUNDING_ACTIVITY, + ObserveReferenceSetDefinitions.SURROUNDING_ACTIVITY) + .addKey(ActivitySeineDto.PROPERTY_WIND, ObserveReferenceSetDefinitions.WIND) + .addKey(ActivitySeineDto.PROPERTY_DETECTION_MODE, + ObserveReferenceSetDefinitions.DETECTION_MODE) + .addKey(ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING, + ObserveReferenceSetDefinitions.REASON_FOR_NO_FISHING) + .addKey(ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE, + ObserveReferenceSetDefinitions.FPA_ZONE) + .addKey(ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE, + ObserveReferenceSetDefinitions.FPA_ZONE) + .addKey(ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE, + ObserveReferenceSetDefinitions.FPA_ZONE) + ), + + FLOATING_OBJECT_FORM(newBuilder(FloatingObjectDto.class) + .addKey(FloatingObjectDto.PROPERTY_OBJECT_TYPE, + ObserveReferenceSetDefinitions.OBJECT_TYPE) + .addKey(FloatingObjectDto.PROPERTY_OBJECT_OPERATION, + ObserveReferenceSetDefinitions.OBJECT_OPERATION) + .addKey(FloatingObjectDto.PROPERTY_OBJECT_FATE, + ObserveReferenceSetDefinitions.OBJECT_FATE) + ), + + SET_SEINE_FORM(newBuilder(SetSeineDto.class) + .addKey(SetSeineDto.PROPERTY_REASON_FOR_NULL_SET, + ObserveReferenceSetDefinitions.REASON_FOR_NULL_SET) + ), + TRIP_SEINE_FORM(newBuilder(TripSeineDto.class) .addKey(TripSeineDto.PROPERTY_OBSERVER, ObserveReferenceSetDefinitions.PERSON) .addKey(TripSeineDto.PROPERTY_CAPTAIN, ObserveReferenceSetDefinitions.PERSON) @@ -20,7 +107,8 @@ public enum ObserveReferenceSetRequestDefinitions { .addKey(TripSeineDto.PROPERTY_OCEAN, ObserveReferenceSetDefinitions.OCEAN) .addKey(TripSeineDto.PROPERTY_DEPARTURE_HARBOUR, ObserveReferenceSetDefinitions.HARBOUR) .addKey(TripSeineDto.PROPERTY_LANDING_HARBOUR, ObserveReferenceSetDefinitions.HARBOUR) - .addKey(TripSeineDto.PROPERTY_PROGRAM, ObserveReferenceSetDefinitions.PROGRAM)),; + .addKey(TripSeineDto.PROPERTY_PROGRAM, ObserveReferenceSetDefinitions.PROGRAM) + ); public final ObserveReferenceSetRequestDefinition definition; -- 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