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

Commits:

10 changed files:

Changes:

  • models/dto-definition/src/main/models/Observe-01-referential-common.model
    ... ... @@ -28,9 +28,9 @@ startDate + {*:1} Date | mayNotNull
    28 28 
     endDate + {*:1} Date | mayNotNull
    29 29 
     coefficients + {*:1} String | notNull
    30 30 
     source + {*:1} String
    31 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    32 
    -ocean {*:0..1} fr.ird.observe.dto.referential.common.OceanReference | notNull
    33 
    -sex {*:1} fr.ird.observe.dto.referential.common.SexReference | notNull
    31 
    +species {*:1} referential.common.SpeciesReference | notNull
    32 
    +ocean {*:0..1} referential.common.OceanReference | notNull
    33 
    +sex {*:1} referential.common.SexReference | notNull
    34 34
    35 35 
     referential.common.Country > referential.I18nReferential | references=code,label,uri,iso2Code,iso3Code
    36 36 
     iso2Code + {*:1} String | notNull unique
    ... ... @@ -43,11 +43,11 @@ startDate + {*:1} Date | mayNotNull
    43 43 
     endDate + {*:1} Date | mayNotNull
    44 44
    45 45 
     referential.common.Gear > referential.I18nReferential
    46 
    -gearCharacteristic {*:*} fr.ird.observe.dto.referential.common.GearCharacteristicReference | ordered
    46 
    +gearCharacteristic {*:*} referential.common.GearCharacteristicReference | ordered
    47 47
    48 48 
     referential.common.GearCharacteristic > referential.I18nReferential | references=code,label,uri,gearCharacteristicType,unit
    49 49 
     unit + {*:1} String
    50 
    -gearCharacteristicType {*:1} fr.ird.observe.dto.referential.common.GearCharacteristicTypeReference
    50 
    +gearCharacteristicType {*:1} referential.common.GearCharacteristicTypeReference
    51 51
    52 52 
     referential.common.GearCharacteristicType > referential.I18nReferential >> referential.common.GearCharacteristicTypeAware
    53 53
    ... ... @@ -56,15 +56,15 @@ locode + {*:1} String | mayNotNull
    56 56 
     latitude + {*:1} Float | mayNotNull
    57 57 
     longitude + {*:1} Float | mayNotNull
    58 58 
     quadrant + {*:1} Integer | mayNotNull
    59 
    -country {*:0..1} fr.ird.observe.dto.referential.common.CountryReference | notNull
    59 
    +country {*:0..1} referential.common.CountryReference | notNull
    60 60
    61 61 
     referential.common.LengthLengthParameter > referential.common.LengthFormulaSupport >> reference.ReferentialDtoReferenceWithNoCodeAware | references=uri,oceanLabel,sexLabel,species,startDate,endDate,inputSizeMeasureType,outputSizeMeasureType,inputOutputFormula,outputInputFormula
    62 62 
     inputOutputFormula + {*:1} String | notNull
    63 63 
     inputOutputFormulaValid + {*:1} boolean
    64 64 
     outputInputFormula + {*:1} String | notNull
    65 65 
     outputInputFormulaValid + {*:1} boolean
    66 
    -inputSizeMeasureType {*:1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference | notNull
    67 
    -outputSizeMeasureType {*:1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference | notNull
    66 
    +inputSizeMeasureType {*:1} referential.common.SizeMeasureTypeReference | notNull
    67 
    +outputSizeMeasureType {*:1} referential.common.SizeMeasureTypeReference | notNull
    68 68
    69 69 
     referential.common.LengthWeightParameter > referential.common.LengthFormulaSupport >> reference.ReferentialDtoReferenceWithNoCodeAware | references=uri,oceanLabel,sexLabel,species,startDate,endDate,lengthWeightFormula,weightLengthFormula,sizeMeasureType
    70 70 
     lengthWeightFormula + {*:1} String | notNull
    ... ... @@ -73,7 +73,7 @@ meanLength + {*:1} Float | strictlyPositiveNumber
    73 73 
     meanWeight + {*:1} Float | strictlyPositiveNumber
    74 74 
     lengthWeightFormulaValid + {*:1} boolean
    75 75 
     weightLengthFormulaValid + {*:1} boolean
    76 
    -sizeMeasureType {*:0..1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference | notNull
    76 
    +sizeMeasureType {*:0..1} referential.common.SizeMeasureTypeReference | notNull
    77 77
    78 78 
     referential.common.Ocean > referential.I18nReferential
    79 79
    ... ... @@ -83,7 +83,7 @@ referential.common.WeightMeasureMethod > referential.I18nReferential
    83 83
    84 84 
     referential.common.Organism > referential.I18nReferential
    85 85 
     description + {*:1} String | mayNotNull
    86 
    -country {*:1} fr.ird.observe.dto.referential.common.CountryReference | notNull
    86 
    +country {*:1} referential.common.CountryReference | notNull
    87 87
    88 88 
     referential.common.Person > referential.Referential >> reference.ReferentialDtoReferenceWithNoCodeAware | references=firstName,lastName,uri,captain,observer,dataEntryOperator,dataSource
    89 89 
     lastName + {*:1} String | notNull
    ... ... @@ -92,7 +92,7 @@ observer + {*:1} boolean
    92 92 
     captain + {*:1} boolean
    93 93 
     dataEntryOperator + {*:1} boolean
    94 94 
     dataSource + {*:1} boolean
    95 
    -country {*:0..1} fr.ird.observe.dto.referential.common.CountryReference | notNull
    95 
    +country {*:0..1} referential.common.CountryReference | notNull
    96 96
    97 97 
     referential.common.Program > referential.I18nReferential >> WithStartEndDate | references=code,label,uri,gearType,gearTypePrefix,tripCount,startDate,endDate NavigationEntryPoint
    98 98 
     nonTargetObservation + {*:1} int
    ... ... @@ -108,7 +108,7 @@ endDate + {*:1} Date | mayNotNull
    108 108 
     comment + {*:1} String
    109 109 
     tripCount + {*:1} int
    110 110 
     gearType {*:1} !fr.ird.observe.dto.referential.common.GearType | notNull
    111 
    -organism {*:1} fr.ird.observe.dto.referential.common.OrganismReference | notNull
    111 
    +organism {*:1} referential.common.OrganismReference | notNull
    112 112 
     gearTypePrefix + {*:1} String
    113 113
    114 114 
     referential.common.Sex > referential.I18nReferential
    ... ... @@ -117,7 +117,7 @@ referential.common.ShipOwner > referential.Referential >> WithStartEndDate | ref
    117 117 
     label + {*:1} String | notNull
    118 118 
     startDate + {*:1} Date | mayNotNull
    119 119 
     endDate + {*:1} Date | mayNotNull
    120 
    -country {*:0..1} fr.ird.observe.dto.referential.common.CountryReference
    120 
    +country {*:0..1} referential.common.CountryReference
    121 121
    122 122 
     referential.common.SizeMeasureType > referential.I18nReferential
    123 123
    ... ... @@ -129,18 +129,18 @@ minLength + {*:1} Float | positiveNumber
    129 129 
     maxLength + {*:1} Float | strictlyPositiveNumber
    130 130 
     minWeight + {*:1} Float | positiveNumber
    131 131 
     maxWeight + {*:1} Float | strictlyPositiveNumber
    132 
    -ocean {*:*} fr.ird.observe.dto.referential.common.OceanReference | ordered mayNotNull
    133 
    -speciesGroup {*:1} fr.ird.observe.dto.referential.common.SpeciesGroupReference | notNull
    134 
    -sizeMeasureType {*:0..1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference
    135 
    -weightMeasureType {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureTypeReference
    132 
    +ocean {*:*} referential.common.OceanReference | ordered mayNotNull
    133 
    +speciesGroup {*:1} referential.common.SpeciesGroupReference | notNull
    134 
    +sizeMeasureType {*:0..1} referential.common.SizeMeasureTypeReference
    135 
    +weightMeasureType {*:0..1} referential.common.WeightMeasureTypeReference
    136 136
    137 137 
     referential.common.SpeciesGroup > referential.I18nReferential
    138 
    -speciesGroupReleaseMode {*:*} fr.ird.observe.dto.referential.common.SpeciesGroupReleaseModeReference | ordered
    138 
    +speciesGroupReleaseMode {*:*} referential.common.SpeciesGroupReleaseModeReference | ordered
    139 139
    140 140 
     referential.common.SpeciesGroupReleaseMode > referential.I18nReferential
    141 141
    142 142 
     referential.common.SpeciesList > referential.I18nReferential
    143 
    -species {*:*} fr.ird.observe.dto.referential.common.SpeciesReference | ordered mayNotNull
    143 
    +species {*:*} referential.common.SpeciesReference | ordered mayNotNull
    144 144
    145 145 
     referential.common.Vessel > referential.I18nReferential | references=code,label,uri,vesselTypeId
    146 146 
     keelCode + {*:1} Integer | strictlyPositiveNumber
    ... ... @@ -159,11 +159,11 @@ tuviId + {*:1} String
    159 159 
     imoId + {*:1} String
    160 160 
     radioCallSignId + {*:1} String
    161 161 
     lloydId + {*:1} String
    162 
    -fleetCountry {*:0..1} fr.ird.observe.dto.referential.common.CountryReference | notNull
    163 
    -flagCountry {*:0..1} fr.ird.observe.dto.referential.common.CountryReference | notNull
    164 
    -vesselType {*:0..1} fr.ird.observe.dto.referential.common.VesselTypeReference | notNull
    165 
    -vesselSizeCategory {*:0..1} fr.ird.observe.dto.referential.common.VesselSizeCategoryReference | notNull
    166 
    -shipOwner {*:0..1} fr.ird.observe.dto.referential.common.ShipOwnerReference
    162 
    +fleetCountry {*:0..1} referential.common.CountryReference | notNull
    163 
    +flagCountry {*:0..1} referential.common.CountryReference | notNull
    164 
    +vesselType {*:0..1} referential.common.VesselTypeReference | notNull
    165 
    +vesselSizeCategory {*:0..1} referential.common.VesselSizeCategoryReference | notNull
    166 
    +shipOwner {*:0..1} referential.common.ShipOwnerReference
    167 167
    168 168 
     referential.common.VesselSizeCategory > referential.Referential | references=code,uri,gaugeLabel,capacityLabel
    169 169 
     capacityLabel + {*:1} String | notNull

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

  • models/dto-definition/src/main/models/Observe-03-referential-ps-observation.model
    ... ... @@ -9,7 +9,7 @@ referential.ps.observation.NonTargetCatchReleaseStatus > referential.I18nReferen
    9 9 
     referential.ps.observation.NonTargetCatchReleasingTime > referential.I18nReferential
    10 10
    11 11 
     referential.ps.observation.ObservedSystem > referential.I18nReferential
    12 
    -schoolType + {*:1} fr.ird.observe.dto.referential.ps.common.SchoolTypeReference
    12 
    +schoolType + {*:1} referential.ps.common.SchoolTypeReference
    13 13
    14 14 
     referential.ps.observation.ReasonForDiscard > referential.I18nReferential
    15 15
    ... ... @@ -22,4 +22,4 @@ referential.ps.observation.SpeciesStatus > referential.I18nReferential
    22 22 
     referential.ps.observation.SurroundingActivity > referential.I18nReferential
    23 23
    24 24 
     referential.ps.observation.WeightCategory > referential.I18nReferential >> reference.ReferentialDtoReferenceWithNoCodeAware | references=code,label,uri,speciesId
    25 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    25 
    +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
    13 13 
     floatingObjectEmpty + {*:1} boolean
    14 14 
     observedSystemDistance + {*:1} Float | mayNotNull positiveNumber
    15 15 
     quadrant + {*:1} Integer | notNull
    16 
    -vesselActivity {*:1} fr.ird.observe.dto.referential.ps.common.VesselActivityReference | notNull
    17 
    -surroundingActivity {*:0..1} fr.ird.observe.dto.referential.ps.observation.SurroundingActivityReference | mayNotNull
    18 
    -wind {*:0..1} fr.ird.observe.dto.referential.common.WindReference | mayNotNull
    19 
    -detectionMode {*:0..1} fr.ird.observe.dto.referential.ps.observation.DetectionModeReference
    20 
    -reasonForNoFishing {*:0..1} fr.ird.observe.dto.referential.ps.observation.ReasonForNoFishingReference
    21 
    -previousFpaZone {*:0..1} fr.ird.observe.dto.referential.common.FpaZoneReference
    22 
    -currentFpaZone {*:0..1} fr.ird.observe.dto.referential.common.FpaZoneReference
    23 
    -nextFpaZone {*:0..1} fr.ird.observe.dto.referential.common.FpaZoneReference
    24 
    -dataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference
    25 
    -set {*:0..1} fr.ird.observe.dto.data.ps.observation.SetReference
    26 
    -observedSystem {*:*} fr.ird.observe.dto.referential.ps.observation.ObservedSystemReference | notNull
    27 
    -nonTargetCatchSpecies {*:*} fr.ird.observe.dto.referential.common.SpeciesReference | unique
    16 
    +vesselActivity {*:1} referential.ps.common.VesselActivityReference | notNull
    17 
    +surroundingActivity {*:0..1} referential.ps.observation.SurroundingActivityReference | mayNotNull
    18 
    +wind {*:0..1} referential.common.WindReference | mayNotNull
    19 
    +detectionMode {*:0..1} referential.ps.observation.DetectionModeReference
    20 
    +reasonForNoFishing {*:0..1} referential.ps.observation.ReasonForNoFishingReference
    21 
    +previousFpaZone {*:0..1} referential.common.FpaZoneReference
    22 
    +currentFpaZone {*:0..1} referential.common.FpaZoneReference
    23 
    +nextFpaZone {*:0..1} referential.common.FpaZoneReference
    24 
    +dataQuality {*:0..1} referential.common.DataQualityReference
    25 
    +set {*:0..1} data.ps.observation.SetReference
    26 
    +observedSystem {*:*} referential.ps.observation.ObservedSystemReference | notNull
    27 
    +nonTargetCatchSpecies {*:*} referential.common.SpeciesReference | unique
    28 28
    29 29 
     data.ps.observation.ActivityStub > data.Data | mainDto=Activity
    30 30 
     time + {*:1} Date
    ... ... @@ -34,7 +34,7 @@ seaSurfaceTemperature + {*:1} Float
    34 34 
     activityEndOfSearching + {*:1} boolean
    35 35
    36 36 
     data.ps.observation.FloatingObject > data.Editable | references=objectOperationLabel navigationParent=data.ps.observation.Activity
    37 
    -objectOperation {*:1} fr.ird.observe.dto.referential.ps.common.ObjectOperationReference | notNull
    37 
    +objectOperation {*:1} referential.ps.common.ObjectOperationReference | notNull
    38 38 
     supportVesselName + {*:1} String
    39 39 
     computedWhenArrivingBiodegradable + {*:1} !fr.ird.observe.dto.data.ps.DcpComputedValue
    40 40 
     computedWhenArrivingNonEntangling + {*:1} !fr.ird.observe.dto.data.ps.DcpComputedValue
    ... ... @@ -52,7 +52,7 @@ objectObservedSpecies {*} data.ps.observation.ObjectObservedSpecies
    52 52 
     data.ps.observation.FloatingObjectPart > data.Data | references=objectMaterialId,objectMaterialLabel,whenArriving,whenLeaving
    53 53 
     whenArriving + {*:1} String
    54 54 
     whenLeaving + {*:1} String
    55 
    -objectMaterial {*:1} fr.ird.observe.dto.referential.ps.common.ObjectMaterialReference
    55 
    +objectMaterial {*:1} referential.ps.common.ObjectMaterialReference
    56 56
    57 57 
     data.ps.observation.FloatingObjectObjectSchoolEstimate > data.Container
    58 58 
     objectSchoolEstimate {*} data.ps.observation.ObjectSchoolEstimate
    ... ... @@ -70,24 +70,24 @@ totalCountComputedSource + {*:1} !fr.ird.observe.dto.data.ps.NonTargetCatchCompu
    70 70 
     hasSample + {*:1} boolean
    71 71 
     well + {*:1} String
    72 72 
     hasRelease + {*:1} boolean
    73 
    -reasonForDiscard {*:0..1} fr.ird.observe.dto.referential.ps.observation.ReasonForDiscardReference
    74 
    -speciesFate {*:0..1} fr.ird.observe.dto.referential.ps.common.SpeciesFateReference | notNull
    75 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    76 
    -weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    77 
    -lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
    73 
    +reasonForDiscard {*:0..1} referential.ps.observation.ReasonForDiscardReference
    74 
    +speciesFate {*:0..1} referential.ps.common.SpeciesFateReference | notNull
    75 
    +species {*:1} referential.common.SpeciesReference | notNull
    76 
    +weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
    77 
    +lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethodReference
    78 78
    79 79 
     data.ps.observation.NonTargetCatchRelease > data.ContainerChild | references=speciesLabel,speciesGroupReleaseModeLabel,statusLabel,conformityLabel,releasingTimeLabel,length
    80 80 
     comment + {*:1} String
    81 81 
     length + {*:1} Float | positiveNumber
    82 82 
     count + {*:1} Integer | notNull strictlyPositiveNumber
    83 83 
     acquisitionMode + {*:1} int
    84 
    -status {*:1} !fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseStatusReference | notNull
    85 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    86 
    -sex {*:1} fr.ird.observe.dto.referential.common.SexReference | notNull
    87 
    -speciesGroupReleaseMode {*:1} fr.ird.observe.dto.referential.common.SpeciesGroupReleaseModeReference | notNull
    88 
    -conformity {*:1} fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseConformityReference
    89 
    -releasingTime {*:1} fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleasingTimeReference
    90 
    -lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
    84 
    +status {*:1} referential.ps.observation.NonTargetCatchReleaseStatusReference | notNull
    85 
    +species {*:1} referential.common.SpeciesReference | notNull
    86 
    +sex {*:1} referential.common.SexReference | notNull
    87 
    +speciesGroupReleaseMode {*:1} referential.common.SpeciesGroupReleaseModeReference | notNull
    88 
    +conformity {*:1} referential.ps.observation.NonTargetCatchReleaseConformityReference
    89 
    +releasingTime {*:1} referential.ps.observation.NonTargetCatchReleasingTimeReference
    90 
    +lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethodReference
    91 91
    92 92 
     data.ps.observation.NonTargetLength > data.ContainerChild | references=speciesLabel,length,sexLabel
    93 93 
     length + {*:1} Float | positiveNumber
    ... ... @@ -98,13 +98,13 @@ isWeightComputed + {*:1} boolean
    98 98 
     count + {*:1} Integer | notNull positiveNumber
    99 99 
     acquisitionMode + {*:1} int
    100 100 
     tagNumber + {*:1} String
    101 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    102 
    -sex {*:1} fr.ird.observe.dto.referential.common.SexReference | notNull
    103 
    -speciesFate {*:0..1} fr.ird.observe.dto.referential.ps.common.SpeciesFateReference | mayNotNull
    104 
    -sizeMeasureType {*:0..1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference | notNull
    105 
    -weightMeasureType {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureTypeReference
    106 
    -weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    107 
    -lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
    101 
    +species {*:1} referential.common.SpeciesReference | notNull
    102 
    +sex {*:1} referential.common.SexReference | notNull
    103 
    +speciesFate {*:0..1} referential.ps.common.SpeciesFateReference | mayNotNull
    104 
    +sizeMeasureType {*:0..1} referential.common.SizeMeasureTypeReference | notNull
    105 
    +weightMeasureType {*:0..1} referential.common.WeightMeasureTypeReference
    106 
    +weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
    107 
    +lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethodReference
    108 108
    109 109 
     data.ps.observation.NonTargetSample > data.Container | form=NonTargetLength references=homeId
    110 110 
     nonTargetLength + {*} data.ps.observation.NonTargetLength | ordered
    ... ... @@ -113,13 +113,13 @@ availableSpeciesFateIds + {*} String | unique
    113 113
    114 114 
     data.ps.observation.ObjectObservedSpecies > data.ContainerChild | references=speciesLabel,speciesStatusLabel,count
    115 115 
     count + {*:1} Integer | notNull positiveNumber
    116 
    -speciesStatus {*:1} fr.ird.observe.dto.referential.ps.observation.SpeciesStatusReference | notNull
    117 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    116 
    +speciesStatus {*:1} referential.ps.observation.SpeciesStatusReference | notNull
    117 
    +species {*:1} referential.common.SpeciesReference | notNull
    118 118
    119 119 
     data.ps.observation.ObjectSchoolEstimate > data.ContainerChild | references=speciesLabel,totalWeight
    120 120 
     totalWeight + {*:1} Integer | notNull positiveNumber
    121 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    122 
    -weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    121 
    +species {*:1} referential.common.SpeciesReference | notNull
    122 
    +weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
    123 123
    124 124 
     data.ps.observation.Route > data.Openable | references=date,comment,activitySize comparator=date navigationParent=data.ps.common.Trip
    125 125 
     comment + {*:1} String
    ... ... @@ -137,8 +137,8 @@ endLogValue + {*:1} Float
    137 137 
     data.ps.observation.SchoolEstimate > data.ContainerChild | references=speciesLabel,meanWeight,totalWeight
    138 138 
     totalWeight + {*:1} Integer | positiveNumber
    139 139 
     meanWeight + {*:1} Integer | positiveNumber
    140 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    141 
    -weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    140 
    +species {*:1} referential.common.SpeciesReference | notNull
    141 
    +weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
    142 142
    143 143 
     data.ps.observation.Set > data.Editable | references=comment,discardedTargetSampleEnabled,keptTargetSampleEnabled,nonTargetSampleEnabled,setNonTargetCatchReleaseEnabled constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime navigationParent=data.ps.observation.Activity
    144 144 
     startTime + {*:1} Date
    ... ... @@ -152,10 +152,10 @@ schoolMeanDepth + {*:1} Integer | positiveNumber
    152 152 
     schoolThickness + {*:1} Integer | positiveNumber
    153 153 
     supportVesselName + {*:1} String
    154 154 
     currentMeasureDepth + {*:1} Integer | positiveNumber
    155 
    -schoolType + {*:1} fr.ird.observe.dto.referential.ps.common.SchoolTypeReference
    155 
    +schoolType + {*:1} referential.ps.common.SchoolTypeReference
    156 156 
     targetCatchCompositionEstimatedByObserver + {*:1} boolean
    157 157 
     targetDiscardCatchCompositionEstimatedByObserver + {*:1} boolean
    158 
    -reasonForNullSet {*:0..1} fr.ird.observe.dto.referential.ps.observation.ReasonForNullSetReference
    158 
    +reasonForNullSet {*:0..1} referential.ps.observation.ReasonForNullSetReference
    159 159 
     discardedTargetSampleEnabled + boolean
    160 160 
     keptTargetSampleEnabled + boolean
    161 161 
     nonTargetSampleEnabled + boolean
    ... ... @@ -189,19 +189,19 @@ comment + {*:1} String
    189 189 
     catchWeight + {*:1} Float | notNull positiveNumber
    190 190 
     hasSample + {*:1} boolean
    191 191 
     well + {*:1} String
    192 
    -weightCategory {*:1} fr.ird.observe.dto.referential.ps.observation.WeightCategoryReference | notNull
    193 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    194 
    -weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    192 
    +weightCategory {*:1} referential.ps.observation.WeightCategoryReference | notNull
    193 
    +species {*:1} referential.common.SpeciesReference | notNull
    194 
    +weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
    195 195
    196 196 
     data.ps.observation.DiscardedTargetCatch > data.ContainerChild | references=speciesLabel,catchWeight mainDto=TargetCatch
    197 197 
     comment + {*:1} String
    198 198 
     catchWeight + {*:1} Float | notNull positiveNumber
    199 199 
     hasSample + {*:1} boolean
    200 200 
     broughtOnDeck + {*:1} Boolean
    201 
    -weightCategory {*:1} fr.ird.observe.dto.referential.ps.observation.WeightCategoryReference | notNull
    202 
    -reasonForDiscard {*:0..1} fr.ird.observe.dto.referential.ps.observation.ReasonForDiscardReference
    203 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    204 
    -weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    201 
    +weightCategory {*:1} referential.ps.observation.WeightCategoryReference | notNull
    202 
    +reasonForDiscard {*:0..1} referential.ps.observation.ReasonForDiscardReference
    203 
    +species {*:1} referential.common.SpeciesReference | notNull
    204 
    +weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
    205 205
    206 206 
     data.ps.observation.TargetLength > data.ContainerChild | references=speciesLabel,length,count constants=totalWeight
    207 207 
     length + {*:1} Float | positiveNumber
    ... ... @@ -211,12 +211,12 @@ weight + {*:1} Float | positiveNumber
    211 211 
     isWeightComputed + {*:1} boolean
    212 212 
     acquisitionMode + {*:1} int
    213 213 
     tagNumber + {*:1} String
    214 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    215 
    -sizeMeasureType {*:1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference | notNull
    216 
    -weightMeasureType {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureTypeReference
    217 
    -sex {*:0..1} fr.ird.observe.dto.referential.common.SexReference
    218 
    -weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    219 
    -lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
    214 
    +species {*:1} referential.common.SpeciesReference | notNull
    215 
    +sizeMeasureType {*:1} referential.common.SizeMeasureTypeReference | notNull
    216 
    +weightMeasureType {*:0..1} referential.common.WeightMeasureTypeReference
    217 
    +sex {*:0..1} referential.common.SexReference
    218 
    +weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
    219 
    +lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethodReference
    220 220
    221 221 
     data.ps.observation.TargetSample > data.Container | form=TargetLength references=homeId,nature,discarded
    222 222 
     targetLength + {*} data.ps.observation.TargetLength | ordered
    ... ... @@ -239,8 +239,8 @@ availableSpeciesIds + {*} String | unique
    239 239 
     data.ps.observation.TransmittingBuoy > data.Data | references=code,comment,transmittingBuoyTypeLabel,transmittingBuoyOperationLabel
    240 240 
     comment + {*:1} String
    241 241 
     code + {*:1} String | mayNotNull
    242 
    -transmittingBuoyOwnership + {*:1} fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipReference
    243 
    -transmittingBuoyType {*:1} fr.ird.observe.dto.referential.ps.common.TransmittingBuoyTypeReference | notNull
    244 
    -transmittingBuoyOperation {*:1} fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOperationReference | notNull
    245 
    -country {*:1} fr.ird.observe.dto.referential.common.CountryReference
    246 
    -vessel {*:1} fr.ird.observe.dto.referential.common.VesselReference
    \ No newline at end of file
    242 
    +transmittingBuoyOwnership + {*:1} referential.ps.common.TransmittingBuoyOwnershipReference
    243 
    +transmittingBuoyType {*:1} referential.ps.common.TransmittingBuoyTypeReference | notNull
    244 
    +transmittingBuoyOperation {*:1} referential.ps.common.TransmittingBuoyOperationReference | notNull
    245 
    +country {*:1} referential.common.CountryReference
    246 
    +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
    5 5 
     number + {*:1} Integer | notNull positiveNumber
    6 6 
     usedInTrip + {*:1} Boolean
    7 7 
     gearUseFeaturesMeasurement + {*} data.ps.common.GearUseFeaturesMeasurement | ordered
    8 
    -gear {*:1} fr.ird.observe.dto.referential.common.GearReference | notNull
    8 
    +gear {*:1} referential.common.GearReference | notNull
    9 9
    10 10 
     data.ps.common.GearUseFeaturesMeasurement > data.Data | references=measurementValue,gearCharacteristicLabel
    11 11 
     measurementValue + {*:1} String
    12 
    -gearCharacteristic {*:1} fr.ird.observe.dto.referential.common.GearCharacteristicReference
    12 
    +gearCharacteristic {*:1} referential.common.GearCharacteristicReference
    13 13
    14 14 
     data.ps.common.Trip > data.Openable >> data.TripAware | references=startDate,endDate,program,routeSize,vessel,observerLabel comparator=startDate navigationParent=referential.common.Program
    15 15 
     comment + {*:1} String
    ... ... @@ -20,16 +20,16 @@ formsUrl + {*:1} String
    20 20 
     reportsUrl + {*:1} String
    21 21 
     historicalData + {*:1} boolean
    22 22 
     ersId + {*:1} String
    23 
    -observer {*:0..1} fr.ird.observe.dto.referential.common.PersonReference | notNull
    24 
    -captain {*:0..1} fr.ird.observe.dto.referential.common.PersonReference | mayNotNull
    25 
    -dataEntryOperator {*:0..1} fr.ird.observe.dto.referential.common.PersonReference | mayNotNull
    26 
    -vessel {*:1} fr.ird.observe.dto.referential.common.VesselReference | notNull
    27 
    -ocean {*:0..1} fr.ird.observe.dto.referential.common.OceanReference | notNull
    28 
    -departureHarbour {*:0..1} fr.ird.observe.dto.referential.common.HarbourReference | notNull
    29 
    -landingHarbour {*:0..1} fr.ird.observe.dto.referential.common.HarbourReference | mayNotNull
    30 
    -dataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference
    23 
    +observer {*:0..1} referential.common.PersonReference | notNull
    24 
    +captain {*:0..1} referential.common.PersonReference | mayNotNull
    25 
    +dataEntryOperator {*:0..1} referential.common.PersonReference | mayNotNull
    26 
    +vessel {*:1} referential.common.VesselReference | notNull
    27 
    +ocean {*:0..1} referential.common.OceanReference | notNull
    28 
    +departureHarbour {*:0..1} referential.common.HarbourReference | notNull
    29 
    +landingHarbour {*:0..1} referential.common.HarbourReference | mayNotNull
    30 
    +dataQuality {*:0..1} referential.common.DataQualityReference
    31 31 
     route {*} data.ps.observation.RouteStub | ordered unique
    32 
    -program {*:1} fr.ird.observe.dto.referential.common.ProgramReference
    32 
    +program {*:1} referential.common.ProgramReference
    33 33
    34 34 
     data.ps.common.TripGearUseFeatures > data.Container
    35 35 
     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
    13 13 
     longitude + {*:1} Float | notNull
    14 14 
     seaSurfaceTemperature + {*:1} Float | mayNotNull strictlyPositiveNumber
    15 15 
     quadrant + {*:1} Integer | notNull
    16 
    -fpaZone {*:1} fr.ird.observe.dto.referential.common.FpaZoneReference | mayNotNull
    17 
    -vesselActivity {*:1} fr.ird.observe.dto.referential.ll.common.VesselActivityReference | notNull
    18 
    -dataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference
    16 
    +fpaZone {*:1} referential.common.FpaZoneReference | mayNotNull
    17 
    +vesselActivity {*:1} referential.ll.common.VesselActivityReference | notNull
    18 
    +dataQuality {*:0..1} referential.common.DataQualityReference
    19 19 
     set {*:0..1} fr.ird.observe.dto.data.ll.observation.SetReference
    20 20
    21 21 
     data.ll.observation.ActivityEncounter > data.Container
    ... ... @@ -32,8 +32,8 @@ hasSet + {*:1} Boolean
    32 32 
     data.ll.observation.BaitsComposition > data.ContainerChildWithProportion | references=proportion,baitTypeLabel,baitSettingStatusLabel,individualSize,individualWeight
    33 33 
     individualSize + {*:1} Integer | positiveNumber
    34 34 
     individualWeight + {*:1} Float | positiveNumber
    35 
    -baitSettingStatus {*:1} fr.ird.observe.dto.referential.ll.common.BaitSettingStatusReference
    36 
    -baitType {*:1} fr.ird.observe.dto.referential.ll.common.BaitTypeReference | notNull
    35 
    +baitSettingStatus {*:1} referential.ll.common.BaitSettingStatusReference
    36 
    +baitType {*:1} referential.ll.common.BaitTypeReference | notNull
    37 37
    38 38 
     data.ll.observation.Basket > data.Data >> data.ll.observation.LonglineElementAware | references=settingIdentifier,haulingIdentifier,parentId
    39 39 
     settingIdentifier + {*:1} Integer | notNull positiveNumber
    ... ... @@ -60,27 +60,27 @@ snapWeight + {*:1} Float | positiveNumber
    60 60 
     tracelineLength + {*:1} Float | positiveNumber
    61 61 
     hookLost + {*:1} Boolean
    62 62 
     traceCutOff + {*:1} Boolean
    63 
    -baitSettingStatus {*:0..1} fr.ird.observe.dto.referential.ll.common.BaitSettingStatusReference
    64 
    -hookSize {*:0..1} fr.ird.observe.dto.referential.ll.common.HookSizeReference
    65 
    -baitHaulingStatus {*:0..1} fr.ird.observe.dto.referential.ll.observation.BaitHaulingStatusReference
    66 
    -hookType {*:0..1} fr.ird.observe.dto.referential.ll.common.HookTypeReference
    67 
    -tracelineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | mayNotNull
    68 
    -topType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | mayNotNull
    69 
    -baitType {*:0..1} fr.ird.observe.dto.referential.ll.common.BaitTypeReference
    63 
    +baitSettingStatus {*:0..1} referential.ll.common.BaitSettingStatusReference
    64 
    +hookSize {*:0..1} referential.ll.common.HookSizeReference
    65 
    +baitHaulingStatus {*:0..1} referential.ll.observation.BaitHaulingStatusReference
    66 
    +hookType {*:0..1} referential.ll.common.HookTypeReference
    67 
    +tracelineType {*:0..1} referential.ll.common.LineTypeReference | mayNotNull
    68 
    +topType {*:0..1} referential.ll.common.LineTypeReference | mayNotNull
    69 
    +baitType {*:0..1} referential.ll.common.BaitTypeReference
    70 70 
     parentId + {*:1} String
    71 71 
     notUsed + {*:1} boolean
    72 72
    73 73 
     data.ll.observation.BranchlinesComposition > data.ContainerChildWithProportion | references=proportion,topTypeLabel,tracelineTypeLabel,length
    74 74 
     length + {*:1} Float | notNull positiveNumber
    75 75 
     tracelineLength + {*:1} Float | positiveNumber
    76 
    -topType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
    77 
    -tracelineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
    76 
    +topType {*:0..1} referential.ll.common.LineTypeReference | notNull
    77 
    +tracelineType {*:0..1} referential.ll.common.LineTypeReference | notNull
    78 78
    79 79 
     data.ll.observation.Catch > data.ContainerChild >> data.ll.observation.LonglinePositionAware | references=homeId
    80 80 
     comment + {*:1} String
    81 
    -section {*:0..1} fr.ird.observe.dto.data.ll.observation.SectionReference
    82 
    -basket {*:0..1} fr.ird.observe.dto.data.ll.observation.BasketReference
    83 
    -branchline {*:0..1} fr.ird.observe.dto.data.ll.observation.BranchlineReference
    81 
    +section {*:0..1} data.ll.observation.SectionReference
    82 
    +basket {*:0..1} data.ll.observation.BasketReference
    83 
    +branchline {*:0..1} data.ll.observation.BranchlineReference
    84 84 
     count + {*:1} Integer | positiveNumber
    85 85 
     totalWeight + {*:1} Float | positiveNumber
    86 86 
     hookWhenDiscarded + {*:1} Boolean
    ... ... @@ -91,33 +91,33 @@ photoReferences + {*:1} String
    91 91 
     number + {*:1} Integer
    92 92 
     acquisitionMode + {*:1} int
    93 93 
     tagNumber + {*:1} String
    94 
    -catchFate {*:1} fr.ird.observe.dto.referential.ll.common.CatchFateReference | notNull
    95 
    -discardHealthStatus {*:1} fr.ird.observe.dto.referential.ll.common.HealthStatusReference
    94 
    +catchFate {*:1} referential.ll.common.CatchFateReference | notNull
    95 
    +discardHealthStatus {*:1} referential.ll.common.HealthStatusReference
    96 96 
     sizeMeasure + {*} data.ll.observation.SizeMeasure
    97 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    98 
    -predator {*:*} fr.ird.observe.dto.referential.common.SpeciesReference
    99 
    -maturityStatus {*:0..1} fr.ird.observe.dto.referential.ll.observation.MaturityStatusReference
    100 
    -stomachFullness {*:0..1} fr.ird.observe.dto.referential.ll.observation.StomachFullnessReference
    101 
    -hookPosition {*:0..1} fr.ird.observe.dto.referential.ll.observation.HookPositionReference
    97 
    +species {*:1} referential.common.SpeciesReference | notNull
    98 
    +predator {*:*} referential.common.SpeciesReference
    99 
    +maturityStatus {*:0..1} referential.ll.observation.MaturityStatusReference
    100 
    +stomachFullness {*:0..1} referential.ll.observation.StomachFullnessReference
    101 
    +hookPosition {*:0..1} referential.ll.observation.HookPositionReference
    102 102 
     weightMeasure + {*} data.ll.observation.WeightMeasure
    103 
    -catchHealthStatus {*:1} fr.ird.observe.dto.referential.ll.common.HealthStatusReference
    104 
    -sex {*:0..1} fr.ird.observe.dto.referential.common.SexReference
    105 
    -weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    103 
    +catchHealthStatus {*:1} referential.ll.common.HealthStatusReference
    104 
    +sex {*:0..1} referential.common.SexReference
    105 
    +weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
    106 106
    107 107 
     data.ll.observation.Encounter > data.ContainerChild | references=encounterTypeLabel,speciesLabel
    108 108 
     distance + {*:1} Float | mayNotNull positiveNumber
    109 109 
     count + {*:1} Integer | mayNotNull positiveNumber
    110 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | mayNotNull
    111 
    -encounterType {*:1} fr.ird.observe.dto.referential.ll.observation.EncounterTypeReference | notNull
    110 
    +species {*:1} referential.common.SpeciesReference | mayNotNull
    111 
    +encounterType {*:1} referential.ll.observation.EncounterTypeReference | notNull
    112 112
    113 113 
     data.ll.observation.FloatlinesComposition > data.ContainerChildWithProportion | references=proportion,lineTypeLabel,length
    114 114 
     length + {*:1} Float | notNull positiveNumber
    115 
    -lineType {*:1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
    115 
    +lineType {*:1} referential.ll.common.LineTypeReference | notNull
    116 116
    117 117 
     data.ll.observation.HooksComposition > data.ContainerChildWithProportion | references=proportion,hookTypeLabel,hookSizeLabel,hookOffset
    118 118 
     hookOffset + {*:1} Integer | positiveNumber
    119 
    -hookType {*:1} fr.ird.observe.dto.referential.ll.common.HookTypeReference | notNull
    120 
    -hookSize {*:1} fr.ird.observe.dto.referential.ll.common.HookSizeReference
    119 
    +hookType {*:1} referential.ll.common.HookTypeReference | notNull
    120 
    +hookSize {*:1} referential.ll.common.HookSizeReference
    121 121
    122 122 
     data.ll.observation.Section > data.Data >> data.ll.observation.LonglineElementAware | references=settingIdentifier,haulingIdentifier,parentId
    123 123 
     settingIdentifier + {*:1} Integer | notNull positiveNumber
    ... ... @@ -128,9 +128,9 @@ notUsed + {*:1} boolean
    128 128
    129 129 
     data.ll.observation.SensorUsed > data.ContainerChildWithDataFile | references=sensorTypeLabel
    130 130 
     sensorSerialNo + {*:1} String | mayNotNull
    131 
    -sensorDataFormat {*:0..1} fr.ird.observe.dto.referential.ll.observation.SensorDataFormatReference
    132 
    -sensorType {*:1} fr.ird.observe.dto.referential.ll.observation.SensorTypeReference | notNull
    133 
    -sensorBrand {*:1} fr.ird.observe.dto.referential.ll.observation.SensorBrandReference
    131 
    +sensorDataFormat {*:0..1} referential.ll.observation.SensorDataFormatReference
    132 
    +sensorType {*:1} referential.ll.observation.SensorTypeReference | notNull
    133 
    +sensorBrand {*:1} referential.ll.observation.SensorBrandReference
    134 134
    135 135 
     data.ll.observation.Set > data.Editable | references=homeId navigationParent=data.ll.observation.Activity
    136 136 
     number + {*:1} Integer | positiveNumber
    ... ... @@ -168,17 +168,17 @@ haulingStartQuadrant + {*:1} Integer | notNull
    168 168 
     haulingEndQuadrant + {*:1} Integer | notNull
    169 169 
     settingStartQuadrant + {*:1} Integer | notNull
    170 170 
     settingEndQuadrant + {*:1} Integer | notNull
    171 
    -settingShape {*:1} fr.ird.observe.dto.referential.ll.common.SettingShapeReference
    172 
    -lineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference
    173 
    -lightsticksType {*:0..1} fr.ird.observe.dto.referential.ll.common.LightsticksTypeReference
    174 
    -lightsticksColor {*:0..1} fr.ird.observe.dto.referential.ll.common.LightsticksColorReference
    171 
    +settingShape {*:1} referential.ll.common.SettingShapeReference
    172 
    +lineType {*:0..1} referential.ll.common.LineTypeReference
    173 
    +lightsticksType {*:0..1} referential.ll.common.LightsticksTypeReference
    174 
    +lightsticksColor {*:0..1} referential.ll.common.LightsticksColorReference
    175 175 
     otherSets {*} data.ll.observation.SetStub | mainDto=skip
    176 176
    177 177 
     data.ll.observation.SetCatch > data.Container >> data.ll.observation.LonglinePositionContainerAware
    178 178 
     catches {*} data.ll.observation.Catch | ordered
    179 
    -sections {*:*} fr.ird.observe.dto.data.ll.observation.SectionReference
    180 
    -baskets {*:*} fr.ird.observe.dto.data.ll.observation.BasketReference
    181 
    -branchlines {*:*} fr.ird.observe.dto.data.ll.observation.BranchlineReference
    179 
    +sections {*:*} data.ll.observation.SectionReference
    180 
    +baskets {*:*} data.ll.observation.BasketReference
    181 
    +branchlines {*:*} data.ll.observation.BranchlineReference
    182 182 
     haulingStartTimeStamp + {*:1} Date
    183 183
    184 184 
     data.ll.observation.SetDetailComposition > data.Simple | mainDto=Set
    ... ... @@ -195,7 +195,7 @@ data.ll.observation.SetGlobalComposition > data.Simple | mainDto=Set
    195 195 
     baitsComposition + {*} data.ll.observation.BaitsComposition
    196 196 
     floatlinesComposition + {*} data.ll.observation.FloatlinesComposition
    197 197 
     hooksComposition + {*} data.ll.observation.HooksComposition
    198 
    -mitigationType:set + {*:*} fr.ird.observe.dto.referential.ll.common.MitigationTypeReference
    198 
    +mitigationType:set + {*:*} referential.ll.common.MitigationTypeReference
    199 199 
     branchlinesComposition + {*} data.ll.observation.BranchlinesComposition
    200 200
    201 201 
     data.ll.observation.SetStub > data.Data | mainDto=Set
    ... ... @@ -204,21 +204,21 @@ activity {*:1} fr.ird.observe.dto.data.ll.observation.ActivityReference | unique
    204 204
    205 205 
     data.ll.observation.SetTdr > data.Container >> data.ll.observation.LonglinePositionContainerAware
    206 206 
     tdr {*} data.ll.observation.Tdr
    207 
    -sections {*:*} fr.ird.observe.dto.data.ll.observation.SectionReference
    208 
    -baskets {*:*} fr.ird.observe.dto.data.ll.observation.BasketReference
    209 
    -branchlines {*:*} fr.ird.observe.dto.data.ll.observation.BranchlineReference
    207 
    +sections {*:*} data.ll.observation.SectionReference
    208 
    +baskets {*:*} data.ll.observation.BasketReference
    209 
    +branchlines {*:*} data.ll.observation.BranchlineReference
    210 210 
     settingStartTimeStamp + {*:1} Date
    211 211
    212 212 
     data.ll.observation.SizeMeasure > data.Data | references=sizeMeasureTypeLabel,size
    213 213 
     size + {*:1} Float | positiveNumber
    214 
    -sizeMeasureType {*:1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference
    215 
    -lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
    214 
    +sizeMeasureType {*:1} referential.common.SizeMeasureTypeReference
    215 
    +lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethodReference
    216 216
    217 217 
     data.ll.observation.Tdr > data.ContainerChildWithDataFile >> data.ll.observation.LonglinePositionAware | references=homeId
    218 218 
     comment + {*:1} String
    219 
    -section {*:0..1} fr.ird.observe.dto.data.ll.observation.SectionReference
    220 
    -basket {*:0..1} fr.ird.observe.dto.data.ll.observation.BasketReference
    221 
    -branchline {*:0..1} fr.ird.observe.dto.data.ll.observation.BranchlineReference
    219 
    +section {*:0..1} data.ll.observation.SectionReference
    220 
    +basket {*:0..1} data.ll.observation.BasketReference
    221 
    +branchline {*:0..1} data.ll.observation.BranchlineReference
    222 222 
     floatline1Length + {*:1} Float | positiveNumber
    223 223 
     floatline2Length + {*:1} Float | positiveNumber
    224 224 
     serialNo + {*:1} String
    ... ... @@ -234,15 +234,15 @@ minFishingDepth + {*:1} Float | positiveNumber
    234 234 
     maxFishingDepth + {*:1} Float | positiveNumber
    235 235 
     meanFishingDepth + {*:1} Float | positiveNumber
    236 236 
     medianFishingDepth + {*:1} Float | positiveNumber
    237 
    -sensorBrand {*:0..1} fr.ird.observe.dto.referential.ll.observation.SensorBrandReference
    238 
    -species {*:*} fr.ird.observe.dto.referential.common.SpeciesReference
    239 
    -itemHorizontalPosition {*:0..1} fr.ird.observe.dto.referential.ll.observation.ItemHorizontalPositionReference
    240 
    -itemVerticalPosition {*:0..1} fr.ird.observe.dto.referential.ll.observation.ItemVerticalPositionReference
    237 
    +sensorBrand {*:0..1} referential.ll.observation.SensorBrandReference
    238 
    +species {*:*} referential.common.SpeciesReference
    239 
    +itemHorizontalPosition {*:0..1} referential.ll.observation.ItemHorizontalPositionReference
    240 
    +itemVerticalPosition {*:0..1} referential.ll.observation.ItemVerticalPositionReference
    241 241
    242 242 
     data.ll.observation.TripActivityStub > data.Data | mainDto=Activity
    243 243 
     timeStamp + {*:1} Date
    244 244
    245 245 
     data.ll.observation.WeightMeasure > data.Data | references=weightMeasureTypeLabel,weight
    246 246 
     weight + {*:1} Float | positiveNumber
    247 
    -weightMeasureType {*:1} fr.ird.observe.dto.referential.common.WeightMeasureTypeReference
    248 
    -weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    247 
    +weightMeasureType {*:1} referential.common.WeightMeasureTypeReference
    248 
    +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
    6 6 
     count + {*:1} Integer | notNull positiveNumber
    7 7 
     acquisitionMode + {*:1} int
    8 8 
     tagNumber + {*:1} String
    9 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    10 
    -sex {*:1} fr.ird.observe.dto.referential.common.SexReference
    11 
    -sizeMeasureType {*:0..1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference
    12 
    -lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
    13 
    -weightMeasureType {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureTypeReference
    14 
    -weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    9 
    +species {*:1} referential.common.SpeciesReference | notNull
    10 
    +sex {*:1} referential.common.SexReference
    11 
    +sizeMeasureType {*:0..1} referential.common.SizeMeasureTypeReference
    12 
    +lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethodReference
    13 
    +weightMeasureType {*:0..1} referential.common.WeightMeasureTypeReference
    14 
    +weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
    15 15
    16 16 
     data.ll.logbook.Sample > data.Openable | references=timeStamp,latitude,longitude comparator=timeStamp navigationParent=data.ll.common.Trip
    17 17 
     comment + {*:1} String
    ... ... @@ -37,16 +37,16 @@ latitude + {*:1} Float | mayNotNull
    37 37 
     longitude + {*:1} Float | mayNotNull
    38 38 
     seaSurfaceTemperature + {*:1} Float | mayNotNull strictlyPositiveNumber
    39 39 
     quadrant + {*:1} Integer | mayNotNull
    40 
    -fpaZone {*:1} fr.ird.observe.dto.referential.common.FpaZoneReference | mayNotNull
    41 
    -wind {*:1} fr.ird.observe.dto.referential.common.WindReference
    40 
    +fpaZone {*:1} referential.common.FpaZoneReference | mayNotNull
    41 
    +wind {*:1} referential.common.WindReference
    42 42 
     windDirection + {*:1} Integer | positiveNumber
    43 43 
     currentSpeed + {*:1} Float | positiveNumber
    44 44 
     currentDirection + {*:1} Integer | positiveNumber
    45 
    -vesselActivity {*:1} fr.ird.observe.dto.referential.ll.common.VesselActivityReference | notNull
    46 
    -dataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference
    45 
    +vesselActivity {*:1} referential.ll.common.VesselActivityReference | notNull
    46 
    +dataQuality {*:0..1} referential.common.DataQualityReference
    47 47 
     set {*:0..1} fr.ird.observe.dto.data.ll.logbook.SetReference
    48 
    -activitySample {*:0..1} fr.ird.observe.dto.data.ll.logbook.ActivitySampleReference
    49 
    -relatedObservedActivity + {0..1} fr.ird.observe.dto.data.ll.observation.ActivityReference | mayNotNull
    48 
    +activitySample {*:0..1} data.ll.logbook.ActivitySampleReference
    49 
    +relatedObservedActivity + {0..1} data.ll.observation.ActivityReference | mayNotNull
    50 50 
     catchSpeciesIds + {*} String | unique
    51 51
    52 52 
     data.ll.logbook.ActivityStub > data.Data | mainDto=Activity
    ... ... @@ -94,11 +94,11 @@ haulingStartQuadrant + {*:1} Integer
    94 94 
     haulingEndQuadrant + {*:1} Integer
    95 95 
     settingStartQuadrant + {*:1} Integer | notNull
    96 96 
     settingEndQuadrant + {*:1} Integer
    97 
    -settingShape {*:1} fr.ird.observe.dto.referential.ll.common.SettingShapeReference
    98 
    -lineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference
    97 
    +settingShape {*:1} referential.ll.common.SettingShapeReference
    98 
    +lineType {*:0..1} referential.ll.common.LineTypeReference
    99 99 
     lightsticksUsed + {*:1} Boolean
    100 
    -lightsticksType {*:0..1} fr.ird.observe.dto.referential.ll.common.LightsticksTypeReference
    101 
    -lightsticksColor {*:0..1} fr.ird.observe.dto.referential.ll.common.LightsticksColorReference
    100 
    +lightsticksType {*:0..1} referential.ll.common.LightsticksTypeReference
    101 
    +lightsticksColor {*:0..1} referential.ll.common.LightsticksColorReference
    102 102 
     otherSets {*} data.ll.logbook.SetStub
    103 103
    104 104 
     data.ll.logbook.SetCatch > data.Container
    ... ... @@ -113,29 +113,29 @@ data.ll.logbook.SetGlobalComposition > data.Simple | mainDto=Set
    113 113 
     baitsComposition + {*} data.ll.logbook.BaitsComposition
    114 114 
     floatlinesComposition + {*} data.ll.logbook.FloatlinesComposition
    115 115 
     hooksComposition + {*} data.ll.logbook.HooksComposition
    116 
    -mitigationType:set + {*:*} fr.ird.observe.dto.referential.ll.common.MitigationTypeReference
    116 
    +mitigationType:set + {*:*} referential.ll.common.MitigationTypeReference
    117 117 
     branchlinesComposition + {*} data.ll.logbook.BranchlinesComposition
    118 118
    119 119 
     data.ll.logbook.BaitsComposition > data.ContainerChildWithProportion | references=proportion,baitTypeLabel,baitSettingStatusLabel,individualSize,individualWeight
    120 120 
     individualSize + {*:1} Integer | positiveNumber
    121 121 
     individualWeight + {*:1} Float | positiveNumber
    122 
    -baitSettingStatus {*:1} fr.ird.observe.dto.referential.ll.common.BaitSettingStatusReference
    123 
    -baitType {*:1} fr.ird.observe.dto.referential.ll.common.BaitTypeReference | notNull
    122 
    +baitSettingStatus {*:1} referential.ll.common.BaitSettingStatusReference
    123 
    +baitType {*:1} referential.ll.common.BaitTypeReference | notNull
    124 124
    125 125 
     data.ll.logbook.BranchlinesComposition > data.ContainerChildWithProportion | references=proportion,topTypeLabel,tracelineTypeLabel,length
    126 126 
     length + {*:1} Float | notNull positiveNumber
    127 127 
     tracelineLength + {*:1} Float | positiveNumber
    128 
    -topType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
    129 
    -tracelineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
    128 
    +topType {*:0..1} referential.ll.common.LineTypeReference | notNull
    129 
    +tracelineType {*:0..1} referential.ll.common.LineTypeReference | notNull
    130 130
    131 131 
     data.ll.logbook.FloatlinesComposition > data.ContainerChildWithProportion | references=proportion,lineTypeLabel,length
    132 132 
     length + {*:1} Float | notNull positiveNumber
    133 
    -lineType {*:1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
    133 
    +lineType {*:1} referential.ll.common.LineTypeReference | notNull
    134 134
    135 135 
     data.ll.logbook.HooksComposition > data.ContainerChildWithProportion | references=proportion,hookTypeLabel,hookSizeLabel,hookOffset
    136 136 
     hookOffset + {*:1} Integer | positiveNumber
    137 
    -hookType {*:1} fr.ird.observe.dto.referential.ll.common.HookTypeReference | notNull
    138 
    -hookSize {*:1} fr.ird.observe.dto.referential.ll.common.HookSizeReference
    137 
    +hookType {*:1} referential.ll.common.HookTypeReference | notNull
    138 
    +hookSize {*:1} referential.ll.common.HookSizeReference
    139 139
    140 140 
     data.ll.logbook.Catch > data.ContainerChild | references=homeId
    141 141 
     comment + {*:1} String
    ... ... @@ -150,10 +150,10 @@ acquisitionMode + {*:1} int
    150 150 
     countDepredated + {*:1} Integer | positiveNumber
    151 151 
     depredatedProportion + {*:1} Integer | strictlyPositiveNumber
    152 152 
     tagNumber + {*:1} String
    153 
    -catchFate {*:1} fr.ird.observe.dto.referential.ll.common.CatchFateReference | notNull
    154 
    -discardHealthStatus {*:1} fr.ird.observe.dto.referential.ll.common.HealthStatusReference
    155 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    156 
    -predator {*:*} fr.ird.observe.dto.referential.common.SpeciesReference
    157 
    -catchHealthStatus {*:1} fr.ird.observe.dto.referential.ll.common.HealthStatusReference
    158 
    -weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    159 
    -onBoardProcessing {*:1} fr.ird.observe.dto.referential.ll.common.OnBoardProcessingReference
    153 
    +catchFate {*:1} referential.ll.common.CatchFateReference | notNull
    154 
    +discardHealthStatus {*:1} referential.ll.common.HealthStatusReference
    155 
    +species {*:1} referential.common.SpeciesReference | notNull
    156 
    +predator {*:*} referential.common.SpeciesReference
    157 
    +catchHealthStatus {*:1} referential.ll.common.HealthStatusReference
    158 
    +weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
    159 
    +onBoardProcessing {*:1} referential.ll.common.OnBoardProcessingReference

  • models/dto-definition/src/main/models/Observe-32-data-ll-landing.model
    1 1 
     package fr.ird.observe.dto.data.ll.landing | form=self packagePriority=32
    2 2
    3 3 
     data.ll.landing.LandingPart > data.ContainerChild | references=speciesLabel,categoryMin,categoryMax,weight
    4 
    -species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    4 
    +species {*:1} referential.common.SpeciesReference | notNull
    5 5 
     categoryMin + {*:1} Float
    6 6 
     categoryMax + {*:1} Float
    7 
    -onBoardProcessing {*:1} fr.ird.observe.dto.referential.ll.common.OnBoardProcessingReference
    8 
    -conservation {*:1} fr.ird.observe.dto.referential.ll.landing.ConservationReference
    7 
    +onBoardProcessing {*:1} referential.ll.common.OnBoardProcessingReference
    8 
    +conservation {*:1} referential.ll.landing.ConservationReference
    9 9 
     count + {*:1} Integer
    10 10 
     weight + {*:1} Float | notNull
    11 
    -weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    12 
    -dataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference
    11 
    +weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethodReference
    12 
    +dataQuality {*:0..1} referential.common.DataQualityReference
    13 13
    14 14 
     data.ll.landing.Landing > data.Openable | references=startDate,harbourLabel,vesselLabel comparator=startDate navigationParent=data.ll.common.Trip
    15 15 
     comment + {*:1} String
    16 16 
     startDate + {*:1} Date
    17 17 
     endDate + {*:1} Date
    18 
    -dataSource {*:1} fr.ird.observe.dto.referential.ll.landing.DataSourceReference
    19 
    -processingCompany {*:1} fr.ird.observe.dto.referential.ll.landing.CompanyReference | mayNotNull
    20 
    -shippingCompany {*:1} fr.ird.observe.dto.referential.ll.landing.CompanyReference
    21 
    -brokerageCompany {*:1} fr.ird.observe.dto.referential.ll.landing.CompanyReference
    22 
    -person {*:1} fr.ird.observe.dto.referential.common.PersonReference
    23 
    -harbour {*:0..1} fr.ird.observe.dto.referential.common.HarbourReference | notNull
    24 
    -vessel {*:0..1} fr.ird.observe.dto.referential.common.VesselReference
    18 
    +dataSource {*:1} referential.ll.landing.DataSourceReference
    19 
    +processingCompany {*:1} referential.ll.landing.CompanyReference | mayNotNull
    20 
    +shippingCompany {*:1} referential.ll.landing.CompanyReference
    21 
    +brokerageCompany {*:1} referential.ll.landing.CompanyReference
    22 
    +person {*:1} referential.common.PersonReference
    23 
    +harbour {*:0..1} referential.common.HarbourReference | notNull
    24 
    +vessel {*:0..1} referential.common.VesselReference
    25 25 
     landingPart + {*} data.ll.landing.LandingPart

  • models/dto-definition/src/main/models/Observe-35-data-ll.model
    ... ... @@ -5,11 +5,11 @@ comment + {*:1} String
    5 5 
     number + {*:1} Integer | notNull positiveNumber
    6 6 
     usedInTrip + {*:1} Boolean
    7 7 
     gearUseFeaturesMeasurement + {*} data.ll.common.GearUseFeaturesMeasurement | ordered
    8 
    -gear {*:1} fr.ird.observe.dto.referential.common.GearReference | notNull
    8 
    +gear {*:1} referential.common.GearReference | notNull
    9 9
    10 10 
     data.ll.common.GearUseFeaturesMeasurement > data.Data | references=measurementValue,gearCharacteristicLabel
    11 11 
     measurementValue + {*:1} String
    12 
    -gearCharacteristic {*:1} fr.ird.observe.dto.referential.common.GearCharacteristicReference
    12 
    +gearCharacteristic {*:1} referential.common.GearCharacteristicReference
    13 13
    14 14 
     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
    15 15 
     startDate + {*:1} Date | notNull
    ... ... @@ -30,21 +30,21 @@ noOfCrewMembers + {*:1} Integer
    30 30 
     noOfDays + {*:1} Integer
    31 31 
     observationsAvailability + {*:1} boolean
    32 32 
     logbookAvailability + {*:1} boolean
    33 
    -tripType {*:1} fr.ird.observe.dto.referential.ll.common.TripTypeReference | notNull
    34 
    -observationMethod {*:1} fr.ird.observe.dto.referential.ll.common.ObservationMethodReference
    35 
    -observer {*:1} fr.ird.observe.dto.referential.common.PersonReference
    36 
    -vessel {*:1} fr.ird.observe.dto.referential.common.VesselReference | notNull
    37 
    -captain {*:1} fr.ird.observe.dto.referential.common.PersonReference | mayNotNull
    38 
    -observationsDataEntryOperator {*:1} fr.ird.observe.dto.referential.common.PersonReference
    39 
    -logbookDataEntryOperator {*:1} fr.ird.observe.dto.referential.common.PersonReference
    40 
    -program {*:1} fr.ird.observe.dto.referential.common.ProgramReference
    41 
    -ocean {*:1} fr.ird.observe.dto.referential.common.OceanReference | notNull
    42 
    -departureHarbour {*:0..1} fr.ird.observe.dto.referential.common.HarbourReference | mayNotNull
    43 
    -landingHarbour {*:0..1} fr.ird.observe.dto.referential.common.HarbourReference | mayNotNull
    44 
    -observationsDataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference
    45 
    -logbookDataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference
    33 
    +tripType {*:1} referential.ll.common.TripTypeReference | notNull
    34 
    +observationMethod {*:1} referential.ll.common.ObservationMethodReference
    35 
    +observer {*:1} referential.common.PersonReference
    36 
    +vessel {*:1} referential.common.VesselReference | notNull
    37 
    +captain {*:1} referential.common.PersonReference | mayNotNull
    38 
    +observationsDataEntryOperator {*:1} referential.common.PersonReference
    39 
    +logbookDataEntryOperator {*:1} referential.common.PersonReference
    40 
    +program {*:1} referential.common.ProgramReference
    41 
    +ocean {*:1} referential.common.OceanReference | notNull
    42 
    +departureHarbour {*:0..1} referential.common.HarbourReference | mayNotNull
    43 
    +landingHarbour {*:0..1} referential.common.HarbourReference | mayNotNull
    44 
    +observationsDataQuality {*:0..1} referential.common.DataQualityReference
    45 
    +logbookDataQuality {*:0..1} referential.common.DataQualityReference
    46 46 
     activityObs + {*} data.ll.observation.TripActivityStub | ordered unique
    47 
    -species {*:*} fr.ird.observe.dto.referential.common.SpeciesReference | mayNotNull
    47 
    +species {*:*} referential.common.SpeciesReference | mayNotNull
    48 48
    49 49 
     data.ll.common.TripGearUseFeatures > data.Container
    50 50 
     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;
    32 32 
     import org.nuiton.eugene.java.BeanTransformerTagValues;
    33 33 
     import org.nuiton.eugene.java.EugeneJavaTagValues;
    34 34 
     import org.nuiton.eugene.models.object.ObjectModel;
    35 
    +import org.nuiton.eugene.models.object.ObjectModelAttribute;
    35 36 
     import org.nuiton.eugene.models.object.ObjectModelClass;
    36 37 
     import org.nuiton.eugene.models.object.ObjectModelPackage;
    38 
    +import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl;
    37 39
    38 40 
     import java.io.File;
    39 41 
     import java.io.IOException;
    ... ... @@ -63,7 +65,10 @@ public abstract class DtoMetaTransformer extends AbstractMetaTransformer<ObjectM
    63 65
    64 66 
             // Get all non abstract beans
    65 67 
             BeanTransformerContext all = new BeanTransformerContext(model, new EugeneCoreTagValues(), new EugeneJavaTagValues(), new BeanTransformerTagValues(), false, false, t -> true, getLog());
    68 
    +        BeanTransformerContext allWithAbstract = new BeanTransformerContext(model, new EugeneCoreTagValues(), new EugeneJavaTagValues(), new BeanTransformerTagValues(), true, false, t -> true, getLog());
    66 69 
             ObserveTagValues observeTagValues = new ObserveTagValues();
    70 
    +        String packageName = getConfiguration().getProperty(PROP_DEFAULT_PACKAGE);
    71 
    +        augmentsReferences(allWithAbstract, packageName);
    67 72 
             augmentsTagValues(model, all, observeTagValues);
    68 73 
             consolidateModel(model, all, observeTagValues, getLog());
    69 74 
             augmentsTagValuesFinal(model, all, observeTagValues);
    ... ... @@ -87,6 +92,20 @@ public abstract class DtoMetaTransformer extends AbstractMetaTransformer<ObjectM
    87 92 
                 }
    88 93 
             }
    89 94 
         }
    95 
    +    protected void augmentsReferences(BeanTransformerContext all, String packageName) {
    96 
    +        for (ObjectModelClass aClass : all.selectedClasses) {
    97 
    +            for (ObjectModelAttribute attribute : aClass.getAttributes()) {
    98 
    +                String attributeType = attribute.getType();
    99 
    +                if (!attributeType.startsWith(packageName) && attributeType.endsWith("Reference")) {
    100 
    +                    // add full package
    101 
    +                    String newValue = packageName + "." + attributeType;
    102 
    +                    getLog().info(String.format("Augments reference attribute value %s.%s=%s", aClass.getQualifiedName(),attribute.getName(), newValue));
    103 
    +                    ((ObjectModelAttributeImpl)attribute).setType(newValue);
    104 
    +
    105 
    +                }
    106 
    +            }
    107 
    +        }
    108 
    +    }
    90 109
    91 110 
         protected void augmentsTagValuesFinal(ObjectModel model, BeanTransformerContext all, ObserveTagValues observeTagValues) {
    92 111 
             for (ObjectModelClass aClass : all.selectedClasses) {

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.