[Git][ultreiaio/ird-observe][develop] augments reference in dto model

25 Jan 2021


      Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
0d7934bb by Tony Chemit at 2021-01-25T10:08:56+01:00
augments reference in dto model

- - - - -


10 changed files:

- models/dto-definition/src/main/models/Observe-01-referential-common.model
- models/dto-definition/src/main/models/Observe-02-referential-ps-common.model
- models/dto-definition/src/main/models/Observe-03-referential-ps-observation.model
- models/dto-definition/src/main/models/Observe-20-data-ps-observation.model
- models/dto-definition/src/main/models/Observe-25-data-ps.model
- models/dto-definition/src/main/models/Observe-30-data-ll-observation.model
- models/dto-definition/src/main/models/Observe-31-data-ll-logbook.model
- models/dto-definition/src/main/models/Observe-32-data-ll-landing.model
- models/dto-definition/src/main/models/Observe-35-data-ll.model
- toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/DtoMetaTransformer.java


Changes:

=====================================
models/dto-definition/src/main/models/Observe-01-referential-common.model
=====================================
@@ -28,9 +28,9 @@ startDate + {*:1} Date | mayNotNull
 endDate + {*:1} Date | mayNotNull
 coefficients + {*:1} String | notNull
 source + {*:1} String
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
-ocean {*:0..1} fr.ird.observe.dto.referential.common.OceanReference | notNull
-sex {*:1} fr.ird.observe.dto.referential.common.SexReference | notNull
+species {*:1} referential.common.SpeciesReference | notNull
+ocean {*:0..1} referential.common.OceanReference | notNull
+sex {*:1} referential.common.SexReference | notNull
 
 referential.common.Country > referential.I18nReferential | references=code,label,uri,iso2Code,iso3Code
 iso2Code + {*:1} String | notNull unique
@@ -43,11 +43,11 @@ startDate + {*:1} Date | mayNotNull
 endDate + {*:1} Date | mayNotNull
 
 referential.common.Gear > referential.I18nReferential
-gearCharacteristic {*:*} fr.ird.observe.dto.referential.common.GearCharacteristicReference | ordered
+gearCharacteristic {*:*} referential.common.GearCharacteristicReference | ordered
 
 referential.common.GearCharacteristic > referential.I18nReferential | references=code,label,uri,gearCharacteristicType,unit
 unit + {*:1} String
-gearCharacteristicType {*:1} fr.ird.observe.dto.referential.common.GearCharacteristicTypeReference
+gearCharacteristicType {*:1} referential.common.GearCharacteristicTypeReference
 
 referential.common.GearCharacteristicType > referential.I18nReferential >> referential.common.GearCharacteristicTypeAware
 
@@ -56,15 +56,15 @@ locode + {*:1} String | mayNotNull
 latitude + {*:1} Float | mayNotNull
 longitude + {*:1} Float | mayNotNull
 quadrant + {*:1} Integer | mayNotNull
-country {*:0..1} fr.ird.observe.dto.referential.common.CountryReference | notNull
+country {*:0..1} referential.common.CountryReference | notNull
 
 referential.common.LengthLengthParameter > referential.common.LengthFormulaSupport >> reference.ReferentialDtoReferenceWithNoCodeAware | references=uri,oceanLabel,sexLabel,species,startDate,endDate,inputSizeMeasureType,outputSizeMeasureType,inputOutputFormula,outputInputFormula
 inputOutputFormula + {*:1} String | notNull
 inputOutputFormulaValid + {*:1} boolean
 outputInputFormula + {*:1} String | notNull
 outputInputFormulaValid + {*:1} boolean
-inputSizeMeasureType {*:1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference | notNull
-outputSizeMeasureType {*:1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference | notNull
+inputSizeMeasureType {*:1} referential.common.SizeMeasureTypeReference | notNull
+outputSizeMeasureType {*:1} referential.common.SizeMeasureTypeReference | notNull
 
 referential.common.LengthWeightParameter > referential.common.LengthFormulaSupport >> reference.ReferentialDtoReferenceWithNoCodeAware | references=uri,oceanLabel,sexLabel,species,startDate,endDate,lengthWeightFormula,weightLengthFormula,sizeMeasureType
 lengthWeightFormula + {*:1} String | notNull
@@ -73,7 +73,7 @@ meanLength + {*:1} Float | strictlyPositiveNumber
 meanWeight + {*:1} Float | strictlyPositiveNumber
 lengthWeightFormulaValid + {*:1} boolean
 weightLengthFormulaValid + {*:1} boolean
-sizeMeasureType {*:0..1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference | notNull
+sizeMeasureType {*:0..1} referential.common.SizeMeasureTypeReference | notNull
 
 referential.common.Ocean > referential.I18nReferential
 
@@ -83,7 +83,7 @@ referential.common.WeightMeasureMethod > referential.I18nReferential
 
 referential.common.Organism > referential.I18nReferential
 description + {*:1} String | mayNotNull
-country {*:1} fr.ird.observe.dto.referential.common.CountryReference | notNull
+country {*:1} referential.common.CountryReference | notNull
 
 referential.common.Person > referential.Referential >> reference.ReferentialDtoReferenceWithNoCodeAware | references=firstName,lastName,uri,captain,observer,dataEntryOperator,dataSource
 lastName + {*:1} String | notNull
@@ -92,7 +92,7 @@ observer + {*:1} boolean
 captain + {*:1} boolean
 dataEntryOperator + {*:1} boolean
 dataSource + {*:1} boolean
-country {*:0..1} fr.ird.observe.dto.referential.common.CountryReference | notNull
+country {*:0..1} referential.common.CountryReference | notNull
 
 referential.common.Program > referential.I18nReferential >> WithStartEndDate | references=code,label,uri,gearType,gearTypePrefix,tripCount,startDate,endDate NavigationEntryPoint
 nonTargetObservation + {*:1} int
@@ -108,7 +108,7 @@ endDate + {*:1} Date | mayNotNull
 comment + {*:1} String
 tripCount + {*:1} int
 gearType {*:1} !fr.ird.observe.dto.referential.common.GearType | notNull
-organism {*:1} fr.ird.observe.dto.referential.common.OrganismReference | notNull
+organism {*:1} referential.common.OrganismReference | notNull
 gearTypePrefix + {*:1} String
 
 referential.common.Sex > referential.I18nReferential
@@ -117,7 +117,7 @@ referential.common.ShipOwner > referential.Referential >> WithStartEndDate | ref
 label + {*:1} String | notNull
 startDate + {*:1} Date | mayNotNull
 endDate + {*:1} Date | mayNotNull
-country {*:0..1} fr.ird.observe.dto.referential.common.CountryReference
+country {*:0..1} referential.common.CountryReference
 
 referential.common.SizeMeasureType > referential.I18nReferential
 
@@ -129,18 +129,18 @@ minLength + {*:1} Float | positiveNumber
 maxLength + {*:1} Float | strictlyPositiveNumber
 minWeight + {*:1} Float | positiveNumber
 maxWeight + {*:1} Float | strictlyPositiveNumber
-ocean {*:*} fr.ird.observe.dto.referential.common.OceanReference | ordered mayNotNull
-speciesGroup {*:1} fr.ird.observe.dto.referential.common.SpeciesGroupReference | notNull
-sizeMeasureType {*:0..1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference
-weightMeasureType {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureTypeReference
+ocean {*:*} referential.common.OceanReference | ordered mayNotNull
+speciesGroup {*:1} referential.common.SpeciesGroupReference | notNull
+sizeMeasureType {*:0..1} referential.common.SizeMeasureTypeReference
+weightMeasureType {*:0..1} referential.common.WeightMeasureTypeReference
 
 referential.common.SpeciesGroup > referential.I18nReferential
-speciesGroupReleaseMode {*:*} fr.ird.observe.dto.referential.common.SpeciesGroupReleaseModeReference | ordered
+speciesGroupReleaseMode {*:*} referential.common.SpeciesGroupReleaseModeReference | ordered
 
 referential.common.SpeciesGroupReleaseMode > referential.I18nReferential
 
 referential.common.SpeciesList > referential.I18nReferential
-species {*:*} fr.ird.observe.dto.referential.common.SpeciesReference | ordered mayNotNull
+species {*:*} referential.common.SpeciesReference | ordered mayNotNull
 
 referential.common.Vessel > referential.I18nReferential | references=code,label,uri,vesselTypeId
 keelCode + {*:1} Integer | strictlyPositiveNumber
@@ -159,11 +159,11 @@ tuviId + {*:1} String
 imoId + {*:1} String
 radioCallSignId + {*:1} String
 lloydId + {*:1} String
-fleetCountry {*:0..1} fr.ird.observe.dto.referential.common.CountryReference | notNull
-flagCountry {*:0..1} fr.ird.observe.dto.referential.common.CountryReference | notNull
-vesselType {*:0..1} fr.ird.observe.dto.referential.common.VesselTypeReference | notNull
-vesselSizeCategory {*:0..1} fr.ird.observe.dto.referential.common.VesselSizeCategoryReference | notNull
-shipOwner {*:0..1} fr.ird.observe.dto.referential.common.ShipOwnerReference
+fleetCountry {*:0..1} referential.common.CountryReference | notNull
+flagCountry {*:0..1} referential.common.CountryReference | notNull
+vesselType {*:0..1} referential.common.VesselTypeReference | notNull
+vesselSizeCategory {*:0..1} referential.common.VesselSizeCategoryReference | notNull
+shipOwner {*:0..1} referential.common.ShipOwnerReference
 
 referential.common.VesselSizeCategory > referential.Referential | references=code,uri,gaugeLabel,capacityLabel
 capacityLabel + {*:1} String | notNull


=====================================
models/dto-definition/src/main/models/Observe-02-referential-ps-common.model
=====================================
@@ -9,8 +9,8 @@ biodegradable + {*:1} Boolean
 nonEntangling + {*:1} Boolean
 childrenMultiSelectable + {*:1} boolean
 childSelectionMandatory + {*:1} boolean
-parent {*:0..1} fr.ird.observe.dto.referential.ps.common.ObjectMaterialReference | mayNotNull
-objectMaterialType {*:1} fr.ird.observe.dto.referential.ps.common.ObjectMaterialTypeReference | mayNotNull
+parent {*:0..1} referential.ps.common.ObjectMaterialReference | mayNotNull
+objectMaterialType {*:1} referential.ps.common.ObjectMaterialTypeReference | mayNotNull
 validation + {*:1} String
 validationValid + {*:1} boolean
 


=====================================
models/dto-definition/src/main/models/Observe-03-referential-ps-observation.model
=====================================
@@ -9,7 +9,7 @@ referential.ps.observation.NonTargetCatchReleaseStatus > referential.I18nReferen
 referential.ps.observation.NonTargetCatchReleasingTime > referential.I18nReferential
 
 referential.ps.observation.ObservedSystem > referential.I18nReferential
-schoolType + {*:1} fr.ird.observe.dto.referential.ps.common.SchoolTypeReference
+schoolType + {*:1} referential.ps.common.SchoolTypeReference
 
 referential.ps.observation.ReasonForDiscard > referential.I18nReferential
 
@@ -22,4 +22,4 @@ referential.ps.observation.SpeciesStatus > referential.I18nReferential
 referential.ps.observation.SurroundingActivity > referential.I18nReferential
 
 referential.ps.observation.WeightCategory > referential.I18nReferential >> reference.ReferentialDtoReferenceWithNoCodeAware | references=code,label,uri,speciesId
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
+species {*:1} referential.common.SpeciesReference | notNull


=====================================
models/dto-definition/src/main/models/Observe-20-data-ps-observation.model
=====================================
@@ -13,18 +13,18 @@ ersId + {*:1} String
 floatingObjectEmpty + {*:1} boolean
 observedSystemDistance + {*:1} Float | mayNotNull positiveNumber
 quadrant + {*:1} Integer | notNull
-vesselActivity {*:1} fr.ird.observe.dto.referential.ps.common.VesselActivityReference | notNull
-surroundingActivity {*:0..1} fr.ird.observe.dto.referential.ps.observation.SurroundingActivityReference | mayNotNull
-wind {*:0..1} fr.ird.observe.dto.referential.common.WindReference | mayNotNull
-detectionMode {*:0..1} fr.ird.observe.dto.referential.ps.observation.DetectionModeReference
-reasonForNoFishing {*:0..1} fr.ird.observe.dto.referential.ps.observation.ReasonForNoFishingReference
-previousFpaZone {*:0..1} fr.ird.observe.dto.referential.common.FpaZoneReference
-currentFpaZone {*:0..1} fr.ird.observe.dto.referential.common.FpaZoneReference
-nextFpaZone {*:0..1} fr.ird.observe.dto.referential.common.FpaZoneReference
-dataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference
-set {*:0..1} fr.ird.observe.dto.data.ps.observation.SetReference
-observedSystem {*:*} fr.ird.observe.dto.referential.ps.observation.ObservedSystemReference | notNull
-nonTargetCatchSpecies {*:*} fr.ird.observe.dto.referential.common.SpeciesReference | unique
+vesselActivity {*:1} referential.ps.common.VesselActivityReference | notNull
+surroundingActivity {*:0..1} referential.ps.observation.SurroundingActivityReference | mayNotNull
+wind {*:0..1} referential.common.WindReference | mayNotNull
+detectionMode {*:0..1} referential.ps.observation.DetectionModeReference
+reasonForNoFishing {*:0..1} referential.ps.observation.ReasonForNoFishingReference
+previousFpaZone {*:0..1} referential.common.FpaZoneReference
+currentFpaZone {*:0..1} referential.common.FpaZoneReference
+nextFpaZone {*:0..1} referential.common.FpaZoneReference
+dataQuality {*:0..1} referential.common.DataQualityReference
+set {*:0..1} data.ps.observation.SetReference
+observedSystem {*:*} referential.ps.observation.ObservedSystemReference | notNull
+nonTargetCatchSpecies {*:*} referential.common.SpeciesReference | unique
 
 data.ps.observation.ActivityStub > data.Data | mainDto=Activity
 time + {*:1} Date
@@ -34,7 +34,7 @@ seaSurfaceTemperature + {*:1} Float
 activityEndOfSearching + {*:1} boolean
 
 data.ps.observation.FloatingObject > data.Editable | references=objectOperationLabel navigationParent=data.ps.observation.Activity
-objectOperation {*:1} fr.ird.observe.dto.referential.ps.common.ObjectOperationReference | notNull
+objectOperation {*:1} referential.ps.common.ObjectOperationReference | notNull
 supportVesselName + {*:1} String
 computedWhenArrivingBiodegradable + {*:1} !fr.ird.observe.dto.data.ps.DcpComputedValue
 computedWhenArrivingNonEntangling + {*:1} !fr.ird.observe.dto.data.ps.DcpComputedValue
@@ -52,7 +52,7 @@ objectObservedSpecies {*} data.ps.observation.ObjectObservedSpecies
 data.ps.observation.FloatingObjectPart > data.Data | references=objectMaterialId,objectMaterialLabel,whenArriving,whenLeaving
 whenArriving + {*:1} String
 whenLeaving + {*:1} String
-objectMaterial {*:1} fr.ird.observe.dto.referential.ps.common.ObjectMaterialReference
+objectMaterial {*:1} referential.ps.common.ObjectMaterialReference
 
 data.ps.observation.FloatingObjectObjectSchoolEstimate > data.Container
 objectSchoolEstimate {*} data.ps.observation.ObjectSchoolEstimate
@@ -70,24 +70,24 @@ totalCountComputedSource + {*:1} !fr.ird.observe.dto.data.ps.NonTargetCatchCompu
 hasSample + {*:1} boolean
 well + {*:1} String
 hasRelease + {*:1} boolean
-reasonForDiscard {*:0..1} fr.ird.observe.dto.referential.ps.observation.ReasonForDiscardReference
-speciesFate {*:0..1} fr.ird.observe.dto.referential.ps.common.SpeciesFateReference | notNull
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
-weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
-lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
+reasonForDiscard {*:0..1} referential.ps.observation.ReasonForDiscardReference
+speciesFate {*:0..1} referential.ps.common.SpeciesFateReference | notNull
+species {*:1} referential.common.SpeciesReference | notNull
+weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
+lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethodReference
 
 data.ps.observation.NonTargetCatchRelease > data.ContainerChild | references=speciesLabel,speciesGroupReleaseModeLabel,statusLabel,conformityLabel,releasingTimeLabel,length
 comment + {*:1} String
 length + {*:1} Float | positiveNumber
 count + {*:1} Integer | notNull strictlyPositiveNumber
 acquisitionMode + {*:1} int
-status {*:1} !fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseStatusReference | notNull
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
-sex {*:1} fr.ird.observe.dto.referential.common.SexReference | notNull
-speciesGroupReleaseMode {*:1} fr.ird.observe.dto.referential.common.SpeciesGroupReleaseModeReference | notNull
-conformity {*:1} fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseConformityReference
-releasingTime {*:1} fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleasingTimeReference
-lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
+status {*:1} referential.ps.observation.NonTargetCatchReleaseStatusReference | notNull
+species {*:1} referential.common.SpeciesReference | notNull
+sex {*:1} referential.common.SexReference | notNull
+speciesGroupReleaseMode {*:1} referential.common.SpeciesGroupReleaseModeReference | notNull
+conformity {*:1} referential.ps.observation.NonTargetCatchReleaseConformityReference
+releasingTime {*:1} referential.ps.observation.NonTargetCatchReleasingTimeReference
+lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethodReference
 
 data.ps.observation.NonTargetLength > data.ContainerChild | references=speciesLabel,length,sexLabel
 length + {*:1} Float | positiveNumber
@@ -98,13 +98,13 @@ isWeightComputed + {*:1} boolean
 count + {*:1} Integer | notNull positiveNumber
 acquisitionMode + {*:1} int
 tagNumber + {*:1} String
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
-sex {*:1} fr.ird.observe.dto.referential.common.SexReference | notNull
-speciesFate {*:0..1} fr.ird.observe.dto.referential.ps.common.SpeciesFateReference | mayNotNull
-sizeMeasureType {*:0..1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference | notNull
-weightMeasureType {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureTypeReference
-weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
-lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
+species {*:1} referential.common.SpeciesReference | notNull
+sex {*:1} referential.common.SexReference | notNull
+speciesFate {*:0..1} referential.ps.common.SpeciesFateReference | mayNotNull
+sizeMeasureType {*:0..1} referential.common.SizeMeasureTypeReference | notNull
+weightMeasureType {*:0..1} referential.common.WeightMeasureTypeReference
+weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
+lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethodReference
 
 data.ps.observation.NonTargetSample > data.Container | form=NonTargetLength references=homeId
 nonTargetLength + {*} data.ps.observation.NonTargetLength | ordered
@@ -113,13 +113,13 @@ availableSpeciesFateIds + {*} String | unique
 
 data.ps.observation.ObjectObservedSpecies > data.ContainerChild | references=speciesLabel,speciesStatusLabel,count
 count + {*:1} Integer | notNull positiveNumber
-speciesStatus {*:1} fr.ird.observe.dto.referential.ps.observation.SpeciesStatusReference | notNull
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
+speciesStatus {*:1} referential.ps.observation.SpeciesStatusReference | notNull
+species {*:1} referential.common.SpeciesReference | notNull
 
 data.ps.observation.ObjectSchoolEstimate > data.ContainerChild | references=speciesLabel,totalWeight
 totalWeight + {*:1} Integer | notNull positiveNumber
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
-weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
+species {*:1} referential.common.SpeciesReference | notNull
+weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
 
 data.ps.observation.Route > data.Openable | references=date,comment,activitySize comparator=date navigationParent=data.ps.common.Trip
 comment + {*:1} String
@@ -137,8 +137,8 @@ endLogValue + {*:1} Float
 data.ps.observation.SchoolEstimate > data.ContainerChild | references=speciesLabel,meanWeight,totalWeight
 totalWeight + {*:1} Integer | positiveNumber
 meanWeight + {*:1} Integer | positiveNumber
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
-weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
+species {*:1} referential.common.SpeciesReference | notNull
+weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
 
 data.ps.observation.Set > data.Editable | references=comment,discardedTargetSampleEnabled,keptTargetSampleEnabled,nonTargetSampleEnabled,setNonTargetCatchReleaseEnabled constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime navigationParent=data.ps.observation.Activity
 startTime + {*:1} Date
@@ -152,10 +152,10 @@ schoolMeanDepth + {*:1} Integer | positiveNumber
 schoolThickness + {*:1} Integer | positiveNumber
 supportVesselName + {*:1} String
 currentMeasureDepth + {*:1} Integer | positiveNumber
-schoolType + {*:1} fr.ird.observe.dto.referential.ps.common.SchoolTypeReference
+schoolType + {*:1} referential.ps.common.SchoolTypeReference
 targetCatchCompositionEstimatedByObserver + {*:1} boolean
 targetDiscardCatchCompositionEstimatedByObserver + {*:1} boolean
-reasonForNullSet {*:0..1} fr.ird.observe.dto.referential.ps.observation.ReasonForNullSetReference
+reasonForNullSet {*:0..1} referential.ps.observation.ReasonForNullSetReference
 discardedTargetSampleEnabled + boolean
 keptTargetSampleEnabled + boolean
 nonTargetSampleEnabled + boolean
@@ -189,19 +189,19 @@ comment + {*:1} String
 catchWeight + {*:1} Float | notNull positiveNumber
 hasSample + {*:1} boolean
 well + {*:1} String
-weightCategory {*:1} fr.ird.observe.dto.referential.ps.observation.WeightCategoryReference | notNull
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
-weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
+weightCategory {*:1} referential.ps.observation.WeightCategoryReference | notNull
+species {*:1} referential.common.SpeciesReference | notNull
+weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
 
 data.ps.observation.DiscardedTargetCatch > data.ContainerChild | references=speciesLabel,catchWeight mainDto=TargetCatch
 comment + {*:1} String
 catchWeight + {*:1} Float | notNull positiveNumber
 hasSample + {*:1} boolean
 broughtOnDeck + {*:1} Boolean
-weightCategory {*:1} fr.ird.observe.dto.referential.ps.observation.WeightCategoryReference | notNull
-reasonForDiscard {*:0..1} fr.ird.observe.dto.referential.ps.observation.ReasonForDiscardReference
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
-weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
+weightCategory {*:1} referential.ps.observation.WeightCategoryReference | notNull
+reasonForDiscard {*:0..1} referential.ps.observation.ReasonForDiscardReference
+species {*:1} referential.common.SpeciesReference | notNull
+weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
 
 data.ps.observation.TargetLength > data.ContainerChild | references=speciesLabel,length,count constants=totalWeight
 length + {*:1} Float | positiveNumber
@@ -211,12 +211,12 @@ weight + {*:1} Float | positiveNumber
 isWeightComputed + {*:1} boolean
 acquisitionMode + {*:1} int
 tagNumber + {*:1} String
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
-sizeMeasureType {*:1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference | notNull
-weightMeasureType {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureTypeReference
-sex {*:0..1} fr.ird.observe.dto.referential.common.SexReference
-weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
-lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
+species {*:1} referential.common.SpeciesReference | notNull
+sizeMeasureType {*:1} referential.common.SizeMeasureTypeReference | notNull
+weightMeasureType {*:0..1} referential.common.WeightMeasureTypeReference
+sex {*:0..1} referential.common.SexReference
+weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
+lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethodReference
 
 data.ps.observation.TargetSample > data.Container | form=TargetLength references=homeId,nature,discarded
 targetLength + {*} data.ps.observation.TargetLength | ordered
@@ -239,8 +239,8 @@ availableSpeciesIds + {*} String | unique
 data.ps.observation.TransmittingBuoy > data.Data | references=code,comment,transmittingBuoyTypeLabel,transmittingBuoyOperationLabel
 comment + {*:1} String
 code + {*:1} String | mayNotNull
-transmittingBuoyOwnership + {*:1} fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipReference
-transmittingBuoyType {*:1} fr.ird.observe.dto.referential.ps.common.TransmittingBuoyTypeReference | notNull
-transmittingBuoyOperation {*:1} fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOperationReference | notNull
-country {*:1} fr.ird.observe.dto.referential.common.CountryReference
-vessel {*:1} fr.ird.observe.dto.referential.common.VesselReference
\ No newline at end of file
+transmittingBuoyOwnership + {*:1} referential.ps.common.TransmittingBuoyOwnershipReference
+transmittingBuoyType {*:1} referential.ps.common.TransmittingBuoyTypeReference | notNull
+transmittingBuoyOperation {*:1} referential.ps.common.TransmittingBuoyOperationReference | notNull
+country {*:1} referential.common.CountryReference
+vessel {*:1} referential.common.VesselReference
\ No newline at end of file


=====================================
models/dto-definition/src/main/models/Observe-25-data-ps.model
=====================================
@@ -5,11 +5,11 @@ comment + {*:1} String
 number + {*:1} Integer | notNull positiveNumber
 usedInTrip + {*:1} Boolean
 gearUseFeaturesMeasurement + {*} data.ps.common.GearUseFeaturesMeasurement | ordered
-gear {*:1} fr.ird.observe.dto.referential.common.GearReference | notNull
+gear {*:1} referential.common.GearReference | notNull
 
 data.ps.common.GearUseFeaturesMeasurement > data.Data | references=measurementValue,gearCharacteristicLabel
 measurementValue + {*:1} String
-gearCharacteristic {*:1} fr.ird.observe.dto.referential.common.GearCharacteristicReference
+gearCharacteristic {*:1} referential.common.GearCharacteristicReference
 
 data.ps.common.Trip > data.Openable >> data.TripAware | references=startDate,endDate,program,routeSize,vessel,observerLabel comparator=startDate navigationParent=referential.common.Program
 comment + {*:1} String
@@ -20,16 +20,16 @@ formsUrl + {*:1} String
 reportsUrl + {*:1} String
 historicalData + {*:1} boolean
 ersId + {*:1} String
-observer {*:0..1} fr.ird.observe.dto.referential.common.PersonReference | notNull
-captain {*:0..1} fr.ird.observe.dto.referential.common.PersonReference | mayNotNull
-dataEntryOperator {*:0..1} fr.ird.observe.dto.referential.common.PersonReference | mayNotNull
-vessel {*:1} fr.ird.observe.dto.referential.common.VesselReference | notNull
-ocean {*:0..1} fr.ird.observe.dto.referential.common.OceanReference | notNull
-departureHarbour {*:0..1} fr.ird.observe.dto.referential.common.HarbourReference | notNull
-landingHarbour {*:0..1} fr.ird.observe.dto.referential.common.HarbourReference | mayNotNull
-dataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference
+observer {*:0..1} referential.common.PersonReference | notNull
+captain {*:0..1} referential.common.PersonReference | mayNotNull
+dataEntryOperator {*:0..1} referential.common.PersonReference | mayNotNull
+vessel {*:1} referential.common.VesselReference | notNull
+ocean {*:0..1} referential.common.OceanReference | notNull
+departureHarbour {*:0..1} referential.common.HarbourReference | notNull
+landingHarbour {*:0..1} referential.common.HarbourReference | mayNotNull
+dataQuality {*:0..1} referential.common.DataQualityReference
 route {*} data.ps.observation.RouteStub | ordered unique
-program {*:1} fr.ird.observe.dto.referential.common.ProgramReference
+program {*:1} referential.common.ProgramReference
 
 data.ps.common.TripGearUseFeatures > data.Container
 gearUseFeatures + {*} data.ps.common.GearUseFeatures | ordered mayNotNull


=====================================
models/dto-definition/src/main/models/Observe-30-data-ll-observation.model
=====================================
@@ -13,9 +13,9 @@ latitude + {*:1} Float | notNull
 longitude + {*:1} Float | notNull
 seaSurfaceTemperature + {*:1} Float | mayNotNull strictlyPositiveNumber
 quadrant + {*:1} Integer | notNull
-fpaZone {*:1} fr.ird.observe.dto.referential.common.FpaZoneReference | mayNotNull
-vesselActivity {*:1} fr.ird.observe.dto.referential.ll.common.VesselActivityReference | notNull
-dataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference
+fpaZone {*:1} referential.common.FpaZoneReference | mayNotNull
+vesselActivity {*:1} referential.ll.common.VesselActivityReference | notNull
+dataQuality {*:0..1} referential.common.DataQualityReference
 set {*:0..1} fr.ird.observe.dto.data.ll.observation.SetReference
 
 data.ll.observation.ActivityEncounter > data.Container
@@ -32,8 +32,8 @@ hasSet + {*:1} Boolean
 data.ll.observation.BaitsComposition > data.ContainerChildWithProportion | references=proportion,baitTypeLabel,baitSettingStatusLabel,individualSize,individualWeight
 individualSize + {*:1} Integer | positiveNumber
 individualWeight + {*:1} Float | positiveNumber
-baitSettingStatus {*:1} fr.ird.observe.dto.referential.ll.common.BaitSettingStatusReference
-baitType {*:1} fr.ird.observe.dto.referential.ll.common.BaitTypeReference | notNull
+baitSettingStatus {*:1} referential.ll.common.BaitSettingStatusReference
+baitType {*:1} referential.ll.common.BaitTypeReference | notNull
 
 data.ll.observation.Basket > data.Data >> data.ll.observation.LonglineElementAware | references=settingIdentifier,haulingIdentifier,parentId
 settingIdentifier + {*:1} Integer | notNull positiveNumber
@@ -60,27 +60,27 @@ snapWeight + {*:1} Float | positiveNumber
 tracelineLength + {*:1} Float | positiveNumber
 hookLost + {*:1} Boolean
 traceCutOff + {*:1} Boolean
-baitSettingStatus {*:0..1} fr.ird.observe.dto.referential.ll.common.BaitSettingStatusReference
-hookSize {*:0..1} fr.ird.observe.dto.referential.ll.common.HookSizeReference
-baitHaulingStatus {*:0..1} fr.ird.observe.dto.referential.ll.observation.BaitHaulingStatusReference
-hookType {*:0..1} fr.ird.observe.dto.referential.ll.common.HookTypeReference
-tracelineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | mayNotNull
-topType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | mayNotNull
-baitType {*:0..1} fr.ird.observe.dto.referential.ll.common.BaitTypeReference
+baitSettingStatus {*:0..1} referential.ll.common.BaitSettingStatusReference
+hookSize {*:0..1} referential.ll.common.HookSizeReference
+baitHaulingStatus {*:0..1} referential.ll.observation.BaitHaulingStatusReference
+hookType {*:0..1} referential.ll.common.HookTypeReference
+tracelineType {*:0..1} referential.ll.common.LineTypeReference | mayNotNull
+topType {*:0..1} referential.ll.common.LineTypeReference | mayNotNull
+baitType {*:0..1} referential.ll.common.BaitTypeReference
 parentId + {*:1} String
 notUsed + {*:1} boolean
 
 data.ll.observation.BranchlinesComposition > data.ContainerChildWithProportion | references=proportion,topTypeLabel,tracelineTypeLabel,length
 length + {*:1} Float | notNull positiveNumber
 tracelineLength + {*:1} Float | positiveNumber
-topType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
-tracelineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
+topType {*:0..1} referential.ll.common.LineTypeReference | notNull
+tracelineType {*:0..1} referential.ll.common.LineTypeReference | notNull
 
 data.ll.observation.Catch > data.ContainerChild >> data.ll.observation.LonglinePositionAware | references=homeId
 comment + {*:1} String
-section {*:0..1} fr.ird.observe.dto.data.ll.observation.SectionReference
-basket {*:0..1} fr.ird.observe.dto.data.ll.observation.BasketReference
-branchline {*:0..1} fr.ird.observe.dto.data.ll.observation.BranchlineReference
+section {*:0..1} data.ll.observation.SectionReference
+basket {*:0..1} data.ll.observation.BasketReference
+branchline {*:0..1} data.ll.observation.BranchlineReference
 count + {*:1} Integer | positiveNumber
 totalWeight + {*:1} Float | positiveNumber
 hookWhenDiscarded + {*:1} Boolean
@@ -91,33 +91,33 @@ photoReferences + {*:1} String
 number + {*:1} Integer
 acquisitionMode + {*:1} int
 tagNumber + {*:1} String
-catchFate {*:1} fr.ird.observe.dto.referential.ll.common.CatchFateReference | notNull
-discardHealthStatus {*:1} fr.ird.observe.dto.referential.ll.common.HealthStatusReference
+catchFate {*:1} referential.ll.common.CatchFateReference | notNull
+discardHealthStatus {*:1} referential.ll.common.HealthStatusReference
 sizeMeasure + {*} data.ll.observation.SizeMeasure
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
-predator {*:*} fr.ird.observe.dto.referential.common.SpeciesReference
-maturityStatus {*:0..1} fr.ird.observe.dto.referential.ll.observation.MaturityStatusReference
-stomachFullness {*:0..1} fr.ird.observe.dto.referential.ll.observation.StomachFullnessReference
-hookPosition {*:0..1} fr.ird.observe.dto.referential.ll.observation.HookPositionReference
+species {*:1} referential.common.SpeciesReference | notNull
+predator {*:*} referential.common.SpeciesReference
+maturityStatus {*:0..1} referential.ll.observation.MaturityStatusReference
+stomachFullness {*:0..1} referential.ll.observation.StomachFullnessReference
+hookPosition {*:0..1} referential.ll.observation.HookPositionReference
 weightMeasure + {*} data.ll.observation.WeightMeasure
-catchHealthStatus {*:1} fr.ird.observe.dto.referential.ll.common.HealthStatusReference
-sex {*:0..1} fr.ird.observe.dto.referential.common.SexReference
-weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
+catchHealthStatus {*:1} referential.ll.common.HealthStatusReference
+sex {*:0..1} referential.common.SexReference
+weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
 
 data.ll.observation.Encounter > data.ContainerChild | references=encounterTypeLabel,speciesLabel
 distance + {*:1} Float | mayNotNull positiveNumber
 count + {*:1} Integer | mayNotNull positiveNumber
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | mayNotNull
-encounterType {*:1} fr.ird.observe.dto.referential.ll.observation.EncounterTypeReference | notNull
+species {*:1} referential.common.SpeciesReference | mayNotNull
+encounterType {*:1} referential.ll.observation.EncounterTypeReference | notNull
 
 data.ll.observation.FloatlinesComposition > data.ContainerChildWithProportion | references=proportion,lineTypeLabel,length
 length + {*:1} Float | notNull positiveNumber
-lineType {*:1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
+lineType {*:1} referential.ll.common.LineTypeReference | notNull
 
 data.ll.observation.HooksComposition > data.ContainerChildWithProportion | references=proportion,hookTypeLabel,hookSizeLabel,hookOffset
 hookOffset + {*:1} Integer | positiveNumber
-hookType {*:1} fr.ird.observe.dto.referential.ll.common.HookTypeReference | notNull
-hookSize {*:1} fr.ird.observe.dto.referential.ll.common.HookSizeReference
+hookType {*:1} referential.ll.common.HookTypeReference | notNull
+hookSize {*:1} referential.ll.common.HookSizeReference
 
 data.ll.observation.Section > data.Data >> data.ll.observation.LonglineElementAware | references=settingIdentifier,haulingIdentifier,parentId
 settingIdentifier + {*:1} Integer | notNull positiveNumber
@@ -128,9 +128,9 @@ notUsed + {*:1} boolean
 
 data.ll.observation.SensorUsed > data.ContainerChildWithDataFile | references=sensorTypeLabel
 sensorSerialNo + {*:1} String | mayNotNull
-sensorDataFormat {*:0..1} fr.ird.observe.dto.referential.ll.observation.SensorDataFormatReference
-sensorType {*:1} fr.ird.observe.dto.referential.ll.observation.SensorTypeReference | notNull
-sensorBrand {*:1} fr.ird.observe.dto.referential.ll.observation.SensorBrandReference
+sensorDataFormat {*:0..1} referential.ll.observation.SensorDataFormatReference
+sensorType {*:1} referential.ll.observation.SensorTypeReference | notNull
+sensorBrand {*:1} referential.ll.observation.SensorBrandReference
 
 data.ll.observation.Set > data.Editable | references=homeId navigationParent=data.ll.observation.Activity
 number + {*:1} Integer | positiveNumber
@@ -168,17 +168,17 @@ haulingStartQuadrant + {*:1} Integer | notNull
 haulingEndQuadrant + {*:1} Integer | notNull
 settingStartQuadrant + {*:1} Integer | notNull
 settingEndQuadrant + {*:1} Integer | notNull
-settingShape {*:1} fr.ird.observe.dto.referential.ll.common.SettingShapeReference
-lineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference
-lightsticksType {*:0..1} fr.ird.observe.dto.referential.ll.common.LightsticksTypeReference
-lightsticksColor {*:0..1} fr.ird.observe.dto.referential.ll.common.LightsticksColorReference
+settingShape {*:1} referential.ll.common.SettingShapeReference
+lineType {*:0..1} referential.ll.common.LineTypeReference
+lightsticksType {*:0..1} referential.ll.common.LightsticksTypeReference
+lightsticksColor {*:0..1} referential.ll.common.LightsticksColorReference
 otherSets {*} data.ll.observation.SetStub | mainDto=skip
 
 data.ll.observation.SetCatch > data.Container >> data.ll.observation.LonglinePositionContainerAware
 catches {*} data.ll.observation.Catch | ordered
-sections {*:*} fr.ird.observe.dto.data.ll.observation.SectionReference
-baskets {*:*} fr.ird.observe.dto.data.ll.observation.BasketReference
-branchlines {*:*} fr.ird.observe.dto.data.ll.observation.BranchlineReference
+sections {*:*} data.ll.observation.SectionReference
+baskets {*:*} data.ll.observation.BasketReference
+branchlines {*:*} data.ll.observation.BranchlineReference
 haulingStartTimeStamp + {*:1} Date
 
 data.ll.observation.SetDetailComposition > data.Simple | mainDto=Set
@@ -195,7 +195,7 @@ data.ll.observation.SetGlobalComposition > data.Simple | mainDto=Set
 baitsComposition + {*} data.ll.observation.BaitsComposition
 floatlinesComposition + {*} data.ll.observation.FloatlinesComposition
 hooksComposition + {*} data.ll.observation.HooksComposition
-mitigationType:set + {*:*} fr.ird.observe.dto.referential.ll.common.MitigationTypeReference
+mitigationType:set + {*:*} referential.ll.common.MitigationTypeReference
 branchlinesComposition + {*} data.ll.observation.BranchlinesComposition
 
 data.ll.observation.SetStub > data.Data | mainDto=Set
@@ -204,21 +204,21 @@ activity {*:1} fr.ird.observe.dto.data.ll.observation.ActivityReference | unique
 
 data.ll.observation.SetTdr > data.Container >> data.ll.observation.LonglinePositionContainerAware
 tdr {*} data.ll.observation.Tdr
-sections {*:*} fr.ird.observe.dto.data.ll.observation.SectionReference
-baskets {*:*} fr.ird.observe.dto.data.ll.observation.BasketReference
-branchlines {*:*} fr.ird.observe.dto.data.ll.observation.BranchlineReference
+sections {*:*} data.ll.observation.SectionReference
+baskets {*:*} data.ll.observation.BasketReference
+branchlines {*:*} data.ll.observation.BranchlineReference
 settingStartTimeStamp + {*:1} Date
 
 data.ll.observation.SizeMeasure > data.Data | references=sizeMeasureTypeLabel,size
 size + {*:1} Float | positiveNumber
-sizeMeasureType {*:1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference
-lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
+sizeMeasureType {*:1} referential.common.SizeMeasureTypeReference
+lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethodReference
 
 data.ll.observation.Tdr > data.ContainerChildWithDataFile >> data.ll.observation.LonglinePositionAware | references=homeId
 comment + {*:1} String
-section {*:0..1} fr.ird.observe.dto.data.ll.observation.SectionReference
-basket {*:0..1} fr.ird.observe.dto.data.ll.observation.BasketReference
-branchline {*:0..1} fr.ird.observe.dto.data.ll.observation.BranchlineReference
+section {*:0..1} data.ll.observation.SectionReference
+basket {*:0..1} data.ll.observation.BasketReference
+branchline {*:0..1} data.ll.observation.BranchlineReference
 floatline1Length + {*:1} Float | positiveNumber
 floatline2Length + {*:1} Float | positiveNumber
 serialNo + {*:1} String
@@ -234,15 +234,15 @@ minFishingDepth + {*:1} Float | positiveNumber
 maxFishingDepth + {*:1} Float | positiveNumber
 meanFishingDepth + {*:1} Float | positiveNumber
 medianFishingDepth + {*:1} Float | positiveNumber
-sensorBrand {*:0..1} fr.ird.observe.dto.referential.ll.observation.SensorBrandReference
-species {*:*} fr.ird.observe.dto.referential.common.SpeciesReference
-itemHorizontalPosition {*:0..1} fr.ird.observe.dto.referential.ll.observation.ItemHorizontalPositionReference
-itemVerticalPosition {*:0..1} fr.ird.observe.dto.referential.ll.observation.ItemVerticalPositionReference
+sensorBrand {*:0..1} referential.ll.observation.SensorBrandReference
+species {*:*} referential.common.SpeciesReference
+itemHorizontalPosition {*:0..1} referential.ll.observation.ItemHorizontalPositionReference
+itemVerticalPosition {*:0..1} referential.ll.observation.ItemVerticalPositionReference
 
 data.ll.observation.TripActivityStub > data.Data | mainDto=Activity
 timeStamp + {*:1} Date
 
 data.ll.observation.WeightMeasure > data.Data | references=weightMeasureTypeLabel,weight
 weight + {*:1} Float | positiveNumber
-weightMeasureType {*:1} fr.ird.observe.dto.referential.common.WeightMeasureTypeReference
-weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
+weightMeasureType {*:1} referential.common.WeightMeasureTypeReference
+weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference


=====================================
models/dto-definition/src/main/models/Observe-31-data-ll-logbook.model
=====================================
@@ -6,12 +6,12 @@ weight + {*:1} Float | positiveNumber
 count + {*:1} Integer | notNull positiveNumber
 acquisitionMode + {*:1} int
 tagNumber + {*:1} String
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
-sex {*:1} fr.ird.observe.dto.referential.common.SexReference
-sizeMeasureType {*:0..1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference
-lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
-weightMeasureType {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureTypeReference
-weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
+species {*:1} referential.common.SpeciesReference | notNull
+sex {*:1} referential.common.SexReference
+sizeMeasureType {*:0..1} referential.common.SizeMeasureTypeReference
+lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethodReference
+weightMeasureType {*:0..1} referential.common.WeightMeasureTypeReference
+weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
 
 data.ll.logbook.Sample > data.Openable | references=timeStamp,latitude,longitude comparator=timeStamp navigationParent=data.ll.common.Trip
 comment + {*:1} String
@@ -37,16 +37,16 @@ latitude + {*:1} Float | mayNotNull
 longitude + {*:1} Float | mayNotNull
 seaSurfaceTemperature + {*:1} Float | mayNotNull strictlyPositiveNumber
 quadrant + {*:1} Integer | mayNotNull
-fpaZone {*:1} fr.ird.observe.dto.referential.common.FpaZoneReference | mayNotNull
-wind {*:1} fr.ird.observe.dto.referential.common.WindReference
+fpaZone {*:1} referential.common.FpaZoneReference | mayNotNull
+wind {*:1} referential.common.WindReference
 windDirection + {*:1} Integer | positiveNumber
 currentSpeed + {*:1} Float | positiveNumber
 currentDirection + {*:1} Integer | positiveNumber
-vesselActivity {*:1} fr.ird.observe.dto.referential.ll.common.VesselActivityReference | notNull
-dataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference
+vesselActivity {*:1} referential.ll.common.VesselActivityReference | notNull
+dataQuality {*:0..1} referential.common.DataQualityReference
 set {*:0..1} fr.ird.observe.dto.data.ll.logbook.SetReference
-activitySample {*:0..1} fr.ird.observe.dto.data.ll.logbook.ActivitySampleReference
-relatedObservedActivity + {0..1} fr.ird.observe.dto.data.ll.observation.ActivityReference | mayNotNull
+activitySample {*:0..1} data.ll.logbook.ActivitySampleReference
+relatedObservedActivity + {0..1} data.ll.observation.ActivityReference | mayNotNull
 catchSpeciesIds + {*} String | unique
 
 data.ll.logbook.ActivityStub > data.Data | mainDto=Activity
@@ -94,11 +94,11 @@ haulingStartQuadrant + {*:1} Integer
 haulingEndQuadrant + {*:1} Integer
 settingStartQuadrant + {*:1} Integer | notNull
 settingEndQuadrant + {*:1} Integer
-settingShape {*:1} fr.ird.observe.dto.referential.ll.common.SettingShapeReference
-lineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference
+settingShape {*:1} referential.ll.common.SettingShapeReference
+lineType {*:0..1} referential.ll.common.LineTypeReference
 lightsticksUsed + {*:1} Boolean
-lightsticksType {*:0..1} fr.ird.observe.dto.referential.ll.common.LightsticksTypeReference
-lightsticksColor {*:0..1} fr.ird.observe.dto.referential.ll.common.LightsticksColorReference
+lightsticksType {*:0..1} referential.ll.common.LightsticksTypeReference
+lightsticksColor {*:0..1} referential.ll.common.LightsticksColorReference
 otherSets {*} data.ll.logbook.SetStub
 
 data.ll.logbook.SetCatch > data.Container
@@ -113,29 +113,29 @@ data.ll.logbook.SetGlobalComposition > data.Simple | mainDto=Set
 baitsComposition + {*} data.ll.logbook.BaitsComposition
 floatlinesComposition + {*} data.ll.logbook.FloatlinesComposition
 hooksComposition + {*} data.ll.logbook.HooksComposition
-mitigationType:set + {*:*} fr.ird.observe.dto.referential.ll.common.MitigationTypeReference
+mitigationType:set + {*:*} referential.ll.common.MitigationTypeReference
 branchlinesComposition + {*} data.ll.logbook.BranchlinesComposition
 
 data.ll.logbook.BaitsComposition > data.ContainerChildWithProportion | references=proportion,baitTypeLabel,baitSettingStatusLabel,individualSize,individualWeight
 individualSize + {*:1} Integer | positiveNumber
 individualWeight + {*:1} Float | positiveNumber
-baitSettingStatus {*:1} fr.ird.observe.dto.referential.ll.common.BaitSettingStatusReference
-baitType {*:1} fr.ird.observe.dto.referential.ll.common.BaitTypeReference | notNull
+baitSettingStatus {*:1} referential.ll.common.BaitSettingStatusReference
+baitType {*:1} referential.ll.common.BaitTypeReference | notNull
 
 data.ll.logbook.BranchlinesComposition > data.ContainerChildWithProportion | references=proportion,topTypeLabel,tracelineTypeLabel,length
 length + {*:1} Float | notNull positiveNumber
 tracelineLength + {*:1} Float | positiveNumber
-topType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
-tracelineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
+topType {*:0..1} referential.ll.common.LineTypeReference | notNull
+tracelineType {*:0..1} referential.ll.common.LineTypeReference | notNull
 
 data.ll.logbook.FloatlinesComposition > data.ContainerChildWithProportion | references=proportion,lineTypeLabel,length
 length + {*:1} Float | notNull positiveNumber
-lineType {*:1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
+lineType {*:1} referential.ll.common.LineTypeReference | notNull
 
 data.ll.logbook.HooksComposition > data.ContainerChildWithProportion | references=proportion,hookTypeLabel,hookSizeLabel,hookOffset
 hookOffset + {*:1} Integer | positiveNumber
-hookType {*:1} fr.ird.observe.dto.referential.ll.common.HookTypeReference | notNull
-hookSize {*:1} fr.ird.observe.dto.referential.ll.common.HookSizeReference
+hookType {*:1} referential.ll.common.HookTypeReference | notNull
+hookSize {*:1} referential.ll.common.HookSizeReference
 
 data.ll.logbook.Catch > data.ContainerChild | references=homeId
 comment + {*:1} String
@@ -150,10 +150,10 @@ acquisitionMode + {*:1} int
 countDepredated + {*:1} Integer | positiveNumber
 depredatedProportion + {*:1} Integer | strictlyPositiveNumber
 tagNumber + {*:1} String
-catchFate {*:1} fr.ird.observe.dto.referential.ll.common.CatchFateReference | notNull
-discardHealthStatus {*:1} fr.ird.observe.dto.referential.ll.common.HealthStatusReference
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
-predator {*:*} fr.ird.observe.dto.referential.common.SpeciesReference
-catchHealthStatus {*:1} fr.ird.observe.dto.referential.ll.common.HealthStatusReference
-weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
-onBoardProcessing {*:1} fr.ird.observe.dto.referential.ll.common.OnBoardProcessingReference
+catchFate {*:1} referential.ll.common.CatchFateReference | notNull
+discardHealthStatus {*:1} referential.ll.common.HealthStatusReference
+species {*:1} referential.common.SpeciesReference | notNull
+predator {*:*} referential.common.SpeciesReference
+catchHealthStatus {*:1} referential.ll.common.HealthStatusReference
+weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
+onBoardProcessing {*:1} referential.ll.common.OnBoardProcessingReference


=====================================
models/dto-definition/src/main/models/Observe-32-data-ll-landing.model
=====================================
@@ -1,25 +1,25 @@
 package fr.ird.observe.dto.data.ll.landing | form=self packagePriority=32
 
 data.ll.landing.LandingPart > data.ContainerChild | references=speciesLabel,categoryMin,categoryMax,weight
-species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
+species {*:1} referential.common.SpeciesReference | notNull
 categoryMin + {*:1} Float
 categoryMax + {*:1} Float
-onBoardProcessing {*:1} fr.ird.observe.dto.referential.ll.common.OnBoardProcessingReference
-conservation {*:1} fr.ird.observe.dto.referential.ll.landing.ConservationReference
+onBoardProcessing {*:1} referential.ll.common.OnBoardProcessingReference
+conservation {*:1} referential.ll.landing.ConservationReference
 count + {*:1} Integer
 weight + {*:1} Float | notNull
-weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
-dataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference
+weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
+dataQuality {*:0..1} referential.common.DataQualityReference
 
 data.ll.landing.Landing > data.Openable | references=startDate,harbourLabel,vesselLabel comparator=startDate navigationParent=data.ll.common.Trip
 comment + {*:1} String
 startDate + {*:1} Date
 endDate + {*:1} Date
-dataSource {*:1} fr.ird.observe.dto.referential.ll.landing.DataSourceReference
-processingCompany {*:1} fr.ird.observe.dto.referential.ll.landing.CompanyReference | mayNotNull
-shippingCompany {*:1} fr.ird.observe.dto.referential.ll.landing.CompanyReference
-brokerageCompany {*:1} fr.ird.observe.dto.referential.ll.landing.CompanyReference
-person {*:1} fr.ird.observe.dto.referential.common.PersonReference
-harbour {*:0..1} fr.ird.observe.dto.referential.common.HarbourReference | notNull
-vessel {*:0..1} fr.ird.observe.dto.referential.common.VesselReference
+dataSource {*:1} referential.ll.landing.DataSourceReference
+processingCompany {*:1} referential.ll.landing.CompanyReference | mayNotNull
+shippingCompany {*:1} referential.ll.landing.CompanyReference
+brokerageCompany {*:1} referential.ll.landing.CompanyReference
+person {*:1} referential.common.PersonReference
+harbour {*:0..1} referential.common.HarbourReference | notNull
+vessel {*:0..1} referential.common.VesselReference
 landingPart + {*} data.ll.landing.LandingPart


=====================================
models/dto-definition/src/main/models/Observe-35-data-ll.model
=====================================
@@ -5,11 +5,11 @@ comment + {*:1} String
 number + {*:1} Integer | notNull positiveNumber
 usedInTrip + {*:1} Boolean
 gearUseFeaturesMeasurement + {*} data.ll.common.GearUseFeaturesMeasurement | ordered
-gear {*:1} fr.ird.observe.dto.referential.common.GearReference | notNull
+gear {*:1} referential.common.GearReference | notNull
 
 data.ll.common.GearUseFeaturesMeasurement > data.Data | references=measurementValue,gearCharacteristicLabel
 measurementValue + {*:1} String
-gearCharacteristic {*:1} fr.ird.observe.dto.referential.common.GearCharacteristicReference
+gearCharacteristic {*:1} referential.common.GearCharacteristicReference
 
 data.ll.common.Trip > data.Openable >> data.TripAware | references=startDate,endDate,program,tripTypeId,observationsActivityCount,logbookActivityCount,landingSize,sampleSize,vessel,observerLabel,observationsAvailability,logbookAvailability comparator=startDate navigationParent=referential.common.Program
 startDate + {*:1} Date | notNull
@@ -30,21 +30,21 @@ noOfCrewMembers + {*:1} Integer
 noOfDays + {*:1} Integer
 observationsAvailability + {*:1} boolean
 logbookAvailability + {*:1} boolean
-tripType {*:1} fr.ird.observe.dto.referential.ll.common.TripTypeReference | notNull
-observationMethod {*:1} fr.ird.observe.dto.referential.ll.common.ObservationMethodReference
-observer {*:1} fr.ird.observe.dto.referential.common.PersonReference
-vessel {*:1} fr.ird.observe.dto.referential.common.VesselReference | notNull
-captain {*:1} fr.ird.observe.dto.referential.common.PersonReference | mayNotNull
-observationsDataEntryOperator {*:1} fr.ird.observe.dto.referential.common.PersonReference
-logbookDataEntryOperator {*:1} fr.ird.observe.dto.referential.common.PersonReference
-program {*:1} fr.ird.observe.dto.referential.common.ProgramReference
-ocean {*:1} fr.ird.observe.dto.referential.common.OceanReference | notNull
-departureHarbour {*:0..1} fr.ird.observe.dto.referential.common.HarbourReference | mayNotNull
-landingHarbour {*:0..1} fr.ird.observe.dto.referential.common.HarbourReference | mayNotNull
-observationsDataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference
-logbookDataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference
+tripType {*:1} referential.ll.common.TripTypeReference | notNull
+observationMethod {*:1} referential.ll.common.ObservationMethodReference
+observer {*:1} referential.common.PersonReference
+vessel {*:1} referential.common.VesselReference | notNull
+captain {*:1} referential.common.PersonReference | mayNotNull
+observationsDataEntryOperator {*:1} referential.common.PersonReference
+logbookDataEntryOperator {*:1} referential.common.PersonReference
+program {*:1} referential.common.ProgramReference
+ocean {*:1} referential.common.OceanReference | notNull
+departureHarbour {*:0..1} referential.common.HarbourReference | mayNotNull
+landingHarbour {*:0..1} referential.common.HarbourReference | mayNotNull
+observationsDataQuality {*:0..1} referential.common.DataQualityReference
+logbookDataQuality {*:0..1} referential.common.DataQualityReference
 activityObs + {*} data.ll.observation.TripActivityStub | ordered unique
-species {*:*} fr.ird.observe.dto.referential.common.SpeciesReference | mayNotNull
+species {*:*} referential.common.SpeciesReference | mayNotNull
 
 data.ll.common.TripGearUseFeatures > data.Container
 gearUseFeatures + {*} data.ll.common.GearUseFeatures | ordered mayNotNull


=====================================
toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/DtoMetaTransformer.java
=====================================
@@ -32,8 +32,10 @@ import org.nuiton.eugene.java.BeanTransformerContext;
 import org.nuiton.eugene.java.BeanTransformerTagValues;
 import org.nuiton.eugene.java.EugeneJavaTagValues;
 import org.nuiton.eugene.models.object.ObjectModel;
+import org.nuiton.eugene.models.object.ObjectModelAttribute;
 import org.nuiton.eugene.models.object.ObjectModelClass;
 import org.nuiton.eugene.models.object.ObjectModelPackage;
+import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl;
 
 import java.io.File;
 import java.io.IOException;
@@ -63,7 +65,10 @@ public abstract class DtoMetaTransformer extends AbstractMetaTransformer<ObjectM
 
         // Get all non abstract beans
         BeanTransformerContext all = new BeanTransformerContext(model, new EugeneCoreTagValues(), new EugeneJavaTagValues(), new BeanTransformerTagValues(), false, false, t -> true, getLog());
+        BeanTransformerContext allWithAbstract = new BeanTransformerContext(model, new EugeneCoreTagValues(), new EugeneJavaTagValues(), new BeanTransformerTagValues(), true, false, t -> true, getLog());
         ObserveTagValues observeTagValues = new ObserveTagValues();
+        String packageName = getConfiguration().getProperty(PROP_DEFAULT_PACKAGE);
+        augmentsReferences(allWithAbstract, packageName);
         augmentsTagValues(model, all, observeTagValues);
         consolidateModel(model, all, observeTagValues, getLog());
         augmentsTagValuesFinal(model, all, observeTagValues);
@@ -87,6 +92,20 @@ public abstract class DtoMetaTransformer extends AbstractMetaTransformer<ObjectM
             }
         }
     }
+    protected void augmentsReferences(BeanTransformerContext all, String packageName) {
+        for (ObjectModelClass aClass : all.selectedClasses) {
+            for (ObjectModelAttribute attribute : aClass.getAttributes()) {
+                String attributeType = attribute.getType();
+                if (!attributeType.startsWith(packageName) && attributeType.endsWith("Reference")) {
+                    // add full package
+                    String newValue = packageName + "." + attributeType;
+                    getLog().info(String.format("Augments reference attribute value %s.%s=%s", aClass.getQualifiedName(),attribute.getName(), newValue));
+                    ((ObjectModelAttributeImpl)attribute).setType(newValue);
+
+                }
+            }
+        }
+    }
 
     protected void augmentsTagValuesFinal(ObjectModel model, BeanTransformerContext all, ObserveTagValues observeTagValues) {
         for (ObjectModelClass aClass : all.selectedClasses) {



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0d7934bbffce9c899793579bd7...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0d7934bbffce9c899793579bd7...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)