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 fbb865cfe23c6d1f861937032b275a6b921230c1 Author: Kevin Morin <morin@codelutin.com> Date: Wed Nov 18 17:53:12 2015 +0100 ajout des définitions pour les référentiels --- .../ObserveReferenceSetRequestDefinitions.java | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) 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 67e81fb..12a26ea 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 @@ -6,6 +6,17 @@ 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.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.referential.HarbourDto; +import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; +import fr.ird.observe.services.dto.referential.OrganismDto; +import fr.ird.observe.services.dto.referential.PersonDto; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.SpeciesListDto; +import fr.ird.observe.services.dto.referential.VesselDto; +import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; @@ -108,6 +119,58 @@ public enum ObserveReferenceSetRequestDefinitions { .addKey(TripSeineDto.PROPERTY_DEPARTURE_HARBOUR, ObserveReferenceSetDefinitions.HARBOUR) .addKey(TripSeineDto.PROPERTY_LANDING_HARBOUR, ObserveReferenceSetDefinitions.HARBOUR) .addKey(TripSeineDto.PROPERTY_PROGRAM, ObserveReferenceSetDefinitions.PROGRAM) + ), + + // REFERENTIAL + + GEAR_CARACTERISTIC_FORM(newBuilder(GearCaracteristicDto.class) + .addKey(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE, + ObserveReferenceSetDefinitions.GEAR_CARACTERISTIC_TYPE) + ), + + GEAR_FORM(newBuilder(GearDto.class) + .addKey(GearDto.PROPERTY_GEAR_CARACTERISTIC, ObserveReferenceSetDefinitions.GEAR_CARACTERISTIC) + ), + + HARBOUR_FORM(newBuilder(HarbourDto.class) + .addKey(HarbourDto.PROPERTY_COUNTRY, ObserveReferenceSetDefinitions.COUNTRY) + ), + + LENGTH_WEIGHT_PARAMETER_FORM(newBuilder(LengthWeightParameterDto.class) + .addKey(LengthWeightParameterDto.PROPERTY_SPECIES, ObserveReferenceSetDefinitions.SPECIES) + .addKey(LengthWeightParameterDto.PROPERTY_OCEAN, ObserveReferenceSetDefinitions.OCEAN) + .addKey(LengthWeightParameterDto.PROPERTY_SEX, ObserveReferenceSetDefinitions.SEX) + ), + + ORGANISM_FORM(newBuilder(OrganismDto.class) + .addKey(OrganismDto.PROPERTY_COUNTRY, ObserveReferenceSetDefinitions.COUNTRY) + ), + + PERSON_FORM(newBuilder(PersonDto.class) + .addKey(PersonDto.PROPERTY_COUNTRY, ObserveReferenceSetDefinitions.COUNTRY) + ), + + PROGRAM_FORM(newBuilder(ProgramDto.class) + .addKey(ProgramDto.PROPERTY_ORGANISM, ObserveReferenceSetDefinitions.ORGANISM) + ), + + SPECIES_FORM(newBuilder(SpeciesDto.class) + .addKey(SpeciesDto.PROPERTY_OCEAN, ObserveReferenceSetDefinitions.OCEAN) + .addKey(SpeciesDto.PROPERTY_SPECIES_GROUP, ObserveReferenceSetDefinitions.SPECIES_GROUP) + ), + + SPECIES_LIST_FORM(newBuilder(SpeciesListDto.class) + .addKey(SpeciesListDto.PROPERTY_SPECIES, ObserveReferenceSetDefinitions.SPECIES) + ), + + VESSEL_FORM(newBuilder(VesselDto.class) + .addKey(VesselDto.PROPERTY_FLAG_COUNTRY, ObserveReferenceSetDefinitions.COUNTRY) + .addKey(VesselDto.PROPERTY_VESSEL_TYPE, ObserveReferenceSetDefinitions.VESSEL_TYPE) + .addKey(VesselDto.PROPERTY_VESSEL_SIZE_CATEGORY, ObserveReferenceSetDefinitions.VESSEL_SIZE_CATEGORY) + ), + + WEIGHT_CATEGORY_FORM(newBuilder(WeightCategoryDto.class) + .addKey(WeightCategoryDto.PROPERTY_SPECIES, ObserveReferenceSetDefinitions.SPECIES) ); public final ObserveReferenceSetRequestDefinition definition; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.