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

Commits:

24 changed files:

Changes:

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/landing/LandingPartImpl.hbm.xml
    ... ... @@ -38,16 +38,16 @@
    38 38 
             <many-to-one name="species" class="fr.ird.observe.entities.referential.common.SpeciesImpl" column="species" foreign-key="fk_ll_landing_landingpart_species" not-null="true" />
    39 39 
             <many-to-one name="dataQuality" class="fr.ird.observe.entities.referential.common.DataQualityImpl" column="dataQuality" foreign-key="fk_ll_landing_landingpart_dataquality" />
    40 40 
             <property name="categoryMin" access="field" type="java.lang.Float">
    41 
    -            <column name="categoryMin" sql-type="numeric"/>
    41 
    +            <column name="categoryMin" precision="6" scale="3" sql-type="numeric"/>
    42 42 
             </property>
    43 43 
             <property name="categoryMax" access="field" type="java.lang.Float">
    44 
    -            <column name="categoryMax" sql-type="numeric"/>
    44 
    +            <column name="categoryMax" precision="6" scale="3" sql-type="numeric"/>
    45 45 
             </property>
    46 46 
             <many-to-one name="onBoardProcessing" class="fr.ird.observe.entities.referential.ll.common.OnBoardProcessingImpl" column="onBoardProcessing" foreign-key="fk_ll_landing_landingpart_onboardprocessing" />
    47 47 
             <many-to-one name="conservation" class="fr.ird.observe.entities.referential.ll.landing.ConservationImpl" column="conservation" foreign-key="fk_ll_landing_landingpart_conservation" />
    48 48 
             <property name="count" access="field" type="java.lang.Integer" column="count"/>
    49 49 
             <property name="weight" access="field" type="java.lang.Float">
    50 
    -            <column name="weight" sql-type="numeric"/>
    50 
    +            <column name="weight" precision="6" scale="3" sql-type="numeric"/>
    51 51 
             </property>
    52 52 
             <many-to-one name="weightMeasureMethod" class="fr.ird.observe.entities.referential.common.WeightMeasureMethodImpl" column="weightMeasureMethod" foreign-key="fk_ll_landing_landingpart_weightmeasuremethod" />
    53 53 
         </class>

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/ActivityImpl.hbm.xml
    ... ... @@ -51,12 +51,12 @@
    51 51 
                 <column name="longitude" precision="6" scale="4" sql-type="numeric"/>
    52 52 
             </property>
    53 53 
             <property name="seaSurfaceTemperature" access="field" type="java.lang.Float">
    54 
    -            <column name="seaSurfaceTemperature" sql-type="numeric"/>
    54 
    +            <column name="seaSurfaceTemperature" precision="6" scale="2" sql-type="numeric"/>
    55 55 
             </property>
    56 56 
             <many-to-one name="wind" class="fr.ird.observe.entities.referential.common.WindImpl" column="wind" foreign-key="fk_ll_logbook_activity_wind" />
    57 57 
             <property name="windDirection" access="field" type="java.lang.Integer" column="windDirection"/>
    58 58 
             <property name="currentSpeed" access="field" type="java.lang.Float">
    59 
    -            <column name="currentSpeed" sql-type="numeric"/>
    59 
    +            <column name="currentSpeed" precision="6" scale="1" sql-type="numeric"/>
    60 60 
             </property>
    61 61 
             <property name="currentDirection" access="field" type="java.lang.Integer" column="currentDirection"/>
    62 62 
             <many-to-one name="vesselActivity" class="fr.ird.observe.entities.referential.ll.common.VesselActivityImpl" column="vesselActivity" foreign-key="fk_ll_logbook_activity_vesselactivity" lazy="false" not-null="true" />

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/BaitsCompositionImpl.hbm.xml
    ... ... @@ -38,7 +38,7 @@
    38 38 
             <property name="proportion" access="field" type="java.lang.Integer" column="proportion"/>
    39 39 
             <property name="individualSize" access="field" type="java.lang.Integer" column="individualSize"/>
    40 40 
             <property name="individualWeight" access="field" type="java.lang.Float">
    41 
    -            <column name="individualWeight" sql-type="numeric"/>
    41 
    +            <column name="individualWeight" precision="6" scale="3" sql-type="numeric"/>
    42 42 
             </property>
    43 43 
             <many-to-one name="baitSettingStatus" class="fr.ird.observe.entities.referential.ll.common.BaitSettingStatusImpl" column="baitSettingStatus" foreign-key="fk_ll_logbook_baitscomposition_baitsettingstatus" />
    44 44 
             <many-to-one name="baitType" class="fr.ird.observe.entities.referential.ll.common.BaitTypeImpl" column="baitType" foreign-key="fk_ll_logbook_baitscomposition_baittype" not-null="true" />

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/BranchlinesCompositionImpl.hbm.xml
    ... ... @@ -36,11 +36,11 @@
    36 36 
             </property>
    37 37 
             <property name="homeId" access="field" type="java.lang.String" column="homeId"/>
    38 38 
             <property name="length" access="field" type="java.lang.Float" not-null="true">
    39 
    -            <column name="length" sql-type="numeric"/>
    39 
    +            <column name="length" precision="6" scale="4" sql-type="numeric"/>
    40 40 
             </property>
    41 41 
             <property name="proportion" access="field" type="java.lang.Integer" column="proportion"/>
    42 42 
             <property name="tracelineLength" access="field" type="java.lang.Float">
    43 
    -            <column name="tracelineLength" sql-type="numeric"/>
    43 
    +            <column name="tracelineLength" precision="6" scale="4" sql-type="numeric"/>
    44 44 
             </property>
    45 45 
             <many-to-one name="topType" class="fr.ird.observe.entities.referential.ll.common.LineTypeImpl" column="topType" foreign-key="fk_ll_logbook_branchlinescomposition_toptype" not-null="true" />
    46 46 
             <many-to-one name="tracelineType" class="fr.ird.observe.entities.referential.ll.common.LineTypeImpl" column="tracelineType" foreign-key="fk_ll_logbook_branchlinescomposition_tracelinetype" not-null="true" />

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/CatchImpl.hbm.xml
    ... ... @@ -40,12 +40,12 @@
    40 40 
             </property>
    41 41 
             <property name="count" access="field" type="java.lang.Integer" column="count"/>
    42 42 
             <property name="totalWeight" access="field" type="java.lang.Float">
    43 
    -            <column name="totalWeight" sql-type="numeric"/>
    43 
    +            <column name="totalWeight" precision="6" scale="3" sql-type="numeric"/>
    44 44 
             </property>
    45 45 
             <property name="hookWhenDiscarded" access="field" type="java.lang.Boolean" column="hookWhenDiscarded"/>
    46 46 
             <property name="depredated" access="field" type="java.lang.Boolean" column="depredated"/>
    47 47 
             <property name="beatDiameter" access="field" type="java.lang.Float">
    48 
    -            <column name="beatDiameter" sql-type="numeric"/>
    48 
    +            <column name="beatDiameter" precision="6" scale="3" sql-type="numeric"/>
    49 49 
             </property>
    50 50 
             <property name="photoReferences" access="field" type="java.lang.String" column="photoReferences"/>
    51 51 
             <property name="number" access="field" type="java.lang.Integer" column="number"/>

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/FloatlinesCompositionImpl.hbm.xml
    ... ... @@ -36,7 +36,7 @@
    36 36 
             </property>
    37 37 
             <property name="homeId" access="field" type="java.lang.String" column="homeId"/>
    38 38 
             <property name="length" access="field" type="java.lang.Float" not-null="true">
    39 
    -            <column name="length" sql-type="numeric"/>
    39 
    +            <column name="length" precision="6" scale="4" sql-type="numeric"/>
    40 40 
             </property>
    41 41 
             <property name="proportion" access="field" type="java.lang.Integer" column="proportion"/>
    42 42 
             <many-to-one name="lineType" class="fr.ird.observe.entities.referential.ll.common.LineTypeImpl" column="lineType" foreign-key="fk_ll_logbook_floatlinescomposition_linetype" not-null="true" />

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SamplePartImpl.hbm.xml
    ... ... @@ -36,10 +36,10 @@
    36 36 
             </property>
    37 37 
             <property name="homeId" access="field" type="java.lang.String" column="homeId"/>
    38 38 
             <property name="length" access="field" type="java.lang.Float">
    39 
    -            <column name="length" sql-type="numeric"/>
    39 
    +            <column name="length" precision="6" scale="1" sql-type="numeric"/>
    40 40 
             </property>
    41 41 
             <property name="weight" access="field" type="java.lang.Float">
    42 
    -            <column name="weight" sql-type="numeric"/>
    42 
    +            <column name="weight" precision="6" scale="2" sql-type="numeric"/>
    43 43 
             </property>
    44 44 
             <property name="count" access="field" type="java.lang.Integer" column="count" not-null="true"/>
    45 45 
             <property name="acquisitionMode" access="field" type="int" column="acquisitionMode"/>

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SetImpl.hbm.xml
    ... ... @@ -48,16 +48,16 @@
    48 48 
             <property name="totalLightsticksCount" access="field" type="java.lang.Integer" column="totalLightsticksCount"/>
    49 49 
             <property name="weightedSnap" access="field" type="java.lang.Boolean" column="weightedSnap"/>
    50 50 
             <property name="snapWeight" access="field" type="java.lang.Float">
    51 
    -            <column name="snapWeight" sql-type="numeric"/>
    51 
    +            <column name="snapWeight" precision="6" scale="3" sql-type="numeric"/>
    52 52 
             </property>
    53 53 
             <property name="weightedSwivel" access="field" type="java.lang.Boolean" column="weightedSwivel"/>
    54 54 
             <property name="swivelWeight" access="field" type="java.lang.Float">
    55 
    -            <column name="swivelWeight" sql-type="numeric"/>
    55 
    +            <column name="swivelWeight" precision="6" scale="3" sql-type="numeric"/>
    56 56 
             </property>
    57 57 
             <property name="timeBetweenHooks" access="field" type="java.lang.Long" column="timeBetweenHooks"/>
    58 58 
             <property name="shooterUsed" access="field" type="java.lang.Boolean" column="shooterUsed"/>
    59 59 
             <property name="shooterSpeed" access="field" type="java.lang.Float">
    60 
    -            <column name="shooterSpeed" sql-type="numeric"/>
    60 
    +            <column name="shooterSpeed" precision="6" scale="3" sql-type="numeric"/>
    61 61 
             </property>
    62 62 
             <property name="maxDepthTargeted" access="field" type="java.lang.Float">
    63 63 
                 <column name="maxDepthTargeted" precision="6" scale="4" sql-type="numeric"/>
    ... ... @@ -81,7 +81,7 @@
    81 81 
                 <column name="settingEndLongitude" precision="6" scale="4" sql-type="numeric"/>
    82 82 
             </property>
    83 83 
             <property name="settingVesselSpeed" access="field" type="java.lang.Float">
    84 
    -            <column name="settingVesselSpeed" sql-type="numeric"/>
    84 
    +            <column name="settingVesselSpeed" precision="6" scale="3" sql-type="numeric"/>
    85 85 
             </property>
    86 86 
             <property name="haulingDirectionSameAsSetting" access="field" type="java.lang.Boolean" column="haulingDirectionSameAsSetting"/>
    87 87 
             <property name="haulingStartTimeStamp" access="field" type="timestamp">

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BaitsCompositionImpl.hbm.xml
    ... ... @@ -38,7 +38,7 @@
    38 38 
             <property name="proportion" access="field" type="java.lang.Integer" column="proportion" not-null="true"/>
    39 39 
             <property name="individualSize" access="field" type="java.lang.Integer" column="individualSize"/>
    40 40 
             <property name="individualWeight" access="field" type="java.lang.Float">
    41 
    -            <column name="individualWeight" sql-type="numeric"/>
    41 
    +            <column name="individualWeight" precision="6" scale="3" sql-type="numeric"/>
    42 42 
             </property>
    43 43 
             <many-to-one name="baitSettingStatus" class="fr.ird.observe.entities.referential.ll.common.BaitSettingStatusImpl" column="baitSettingStatus" foreign-key="fk_ll_observation_baitscomposition_baitsettingstatus" />
    44 44 
             <many-to-one name="baitType" class="fr.ird.observe.entities.referential.ll.common.BaitTypeImpl" column="baitType" foreign-key="fk_ll_observation_baitscomposition_baittype" not-null="true" />

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BasketImpl.hbm.xml
    ... ... @@ -38,10 +38,10 @@
    38 38 
             <property name="settingIdentifier" access="field" type="java.lang.Integer" column="settingIdentifier" not-null="true"/>
    39 39 
             <property name="haulingIdentifier" access="field" type="java.lang.Integer" column="haulingIdentifier"/>
    40 40 
             <property name="floatline1Length" access="field" type="java.lang.Float">
    41 
    -            <column name="floatline1Length" sql-type="numeric"/>
    41 
    +            <column name="floatline1Length" precision="6" scale="4" sql-type="numeric"/>
    42 42 
             </property>
    43 43 
             <property name="floatline2Length" access="field" type="java.lang.Float">
    44 
    -            <column name="floatline2Length" sql-type="numeric"/>
    44 
    +            <column name="floatline2Length" precision="6" scale="4" sql-type="numeric"/>
    45 45 
             </property>
    46 46 
             <set name="branchline" order-by="settingIdentifier" lazy="true" cascade="all,delete-orphan" >
    47 47 
                 <key column="basket" foreign-key="fk_ll_observation_basket_branchline" not-null="true" />

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BranchlineImpl.hbm.xml
    ... ... @@ -49,7 +49,7 @@
    49 49 
             <property name="timeSinceContact" access="field" type="java.lang.Integer" column="timeSinceContact"/>
    50 50 
             <property name="hookOffset" access="field" type="java.lang.Integer" column="hookOffset"/>
    51 51 
             <property name="branchlineLength" access="field" type="java.lang.Float">
    52 
    -            <column name="branchlineLength" sql-type="numeric"/>
    52 
    +            <column name="branchlineLength" precision="6" scale="4" sql-type="numeric"/>
    53 53 
             </property>
    54 54 
             <property name="weightedSwivel" access="field" type="boolean" not-null="true">
    55 55 
                 <column default="false" name="weightedSwivel"/>
    ... ... @@ -61,13 +61,13 @@
    61 61 
                 <column default="false" name="weightedSnap"/>
    62 62 
             </property>
    63 63 
             <property name="swivelWeight" access="field" type="java.lang.Float">
    64 
    -            <column name="swivelWeight" sql-type="numeric"/>
    64 
    +            <column name="swivelWeight" precision="6" scale="3" sql-type="numeric"/>
    65 65 
             </property>
    66 66 
             <property name="snapWeight" access="field" type="java.lang.Float">
    67 
    -            <column name="snapWeight" sql-type="numeric"/>
    67 
    +            <column name="snapWeight" precision="6" scale="3" sql-type="numeric"/>
    68 68 
             </property>
    69 69 
             <property name="tracelineLength" access="field" type="java.lang.Float">
    70 
    -            <column name="tracelineLength" sql-type="numeric"/>
    70 
    +            <column name="tracelineLength" precision="6" scale="4" sql-type="numeric"/>
    71 71 
             </property>
    72 72 
             <property name="hookLost" access="field" type="boolean" not-null="true">
    73 73 
                 <column default="false" name="hookLost"/>

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BranchlinesCompositionImpl.hbm.xml
    ... ... @@ -36,11 +36,11 @@
    36 36 
             </property>
    37 37 
             <property name="homeId" access="field" type="java.lang.String" column="homeId"/>
    38 38 
             <property name="length" access="field" type="java.lang.Float" not-null="true">
    39 
    -            <column name="length" sql-type="numeric"/>
    39 
    +            <column name="length" precision="6" scale="4" sql-type="numeric"/>
    40 40 
             </property>
    41 41 
             <property name="proportion" access="field" type="java.lang.Integer" column="proportion" not-null="true"/>
    42 42 
             <property name="tracelineLength" access="field" type="java.lang.Float">
    43 
    -            <column name="tracelineLength" sql-type="numeric"/>
    43 
    +            <column name="tracelineLength" precision="6" scale="4" sql-type="numeric"/>
    44 44 
             </property>
    45 45 
             <many-to-one name="topType" class="fr.ird.observe.entities.referential.ll.common.LineTypeImpl" column="topType" foreign-key="fk_ll_observation_branchlinescomposition_toptype" not-null="true" />
    46 46 
             <many-to-one name="tracelineType" class="fr.ird.observe.entities.referential.ll.common.LineTypeImpl" column="tracelineType" foreign-key="fk_ll_observation_branchlinescomposition_tracelinetype" not-null="true" />

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/CatchImpl.hbm.xml
    ... ... @@ -40,17 +40,17 @@
    40 40 
             </property>
    41 41 
             <property name="count" access="field" type="java.lang.Integer" column="count" not-null="true"/>
    42 42 
             <property name="totalWeight" access="field" type="java.lang.Float">
    43 
    -            <column name="totalWeight" sql-type="numeric"/>
    43 
    +            <column name="totalWeight" precision="6" scale="3" sql-type="numeric"/>
    44 44 
             </property>
    45 45 
             <property name="hookWhenDiscarded" access="field" type="java.lang.Boolean" column="hookWhenDiscarded"/>
    46 46 
             <property name="depredated" access="field" type="boolean" not-null="true">
    47 47 
                 <column default="false" name="depredated"/>
    48 48 
             </property>
    49 49 
             <property name="beatDiameter" access="field" type="java.lang.Float">
    50 
    -            <column name="beatDiameter" sql-type="numeric"/>
    50 
    +            <column name="beatDiameter" precision="6" scale="3" sql-type="numeric"/>
    51 51 
             </property>
    52 52 
             <property name="gonadeWeight" access="field" type="java.lang.Float">
    53 
    -            <column name="gonadeWeight" sql-type="numeric"/>
    53 
    +            <column name="gonadeWeight" precision="6" scale="3" sql-type="numeric"/>
    54 54 
             </property>
    55 55 
             <property name="photoReferences" access="field" type="java.lang.String" column="photoReferences"/>
    56 56 
             <property name="number" access="field" type="java.lang.Integer" column="number"/>

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/EncounterImpl.hbm.xml
    ... ... @@ -36,7 +36,7 @@
    36 36 
             </property>
    37 37 
             <property name="homeId" access="field" type="java.lang.String" column="homeId"/>
    38 38 
             <property name="distance" access="field" type="java.lang.Float">
    39 
    -            <column name="distance" sql-type="numeric"/>
    39 
    +            <column name="distance" precision="6" scale="3" sql-type="numeric"/>
    40 40 
             </property>
    41 41 
             <property name="count" access="field" type="java.lang.Integer" column="count"/>
    42 42 
             <many-to-one name="encounterType" class="fr.ird.observe.entities.referential.ll.observation.EncounterTypeImpl" column="encounterType" foreign-key="fk_ll_observation_encounter_encountertype" not-null="true" />

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesCompositionImpl.hbm.xml
    ... ... @@ -36,7 +36,7 @@
    36 36 
             </property>
    37 37 
             <property name="homeId" access="field" type="java.lang.String" column="homeId"/>
    38 38 
             <property name="length" access="field" type="java.lang.Float" not-null="true">
    39 
    -            <column name="length" sql-type="numeric"/>
    39 
    +            <column name="length" precision="6" scale="4" sql-type="numeric"/>
    40 40 
             </property>
    41 41 
             <property name="proportion" access="field" type="java.lang.Integer" column="proportion" not-null="true"/>
    42 42 
             <many-to-one name="lineType" class="fr.ird.observe.entities.referential.ll.common.LineTypeImpl" column="lineType" foreign-key="fk_ll_observation_floatlinescomposition_linetype" not-null="true" />

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SetImpl.hbm.xml
    ... ... @@ -48,13 +48,13 @@
    48 48 
                 <column default="false" name="weightedSnap"/>
    49 49 
             </property>
    50 50 
             <property name="snapWeight" access="field" type="java.lang.Float">
    51 
    -            <column name="snapWeight" sql-type="numeric"/>
    51 
    +            <column name="snapWeight" precision="6" scale="3" sql-type="numeric"/>
    52 52 
             </property>
    53 53 
             <property name="weightedSwivel" access="field" type="boolean" not-null="true">
    54 54 
                 <column default="false" name="weightedSwivel"/>
    55 55 
             </property>
    56 56 
             <property name="swivelWeight" access="field" type="java.lang.Float">
    57 
    -            <column name="swivelWeight" sql-type="numeric"/>
    57 
    +            <column name="swivelWeight" precision="6" scale="3" sql-type="numeric"/>
    58 58 
             </property>
    59 59 
             <property name="lightsticksPerBasketCount" access="field" type="java.lang.Integer" column="lightsticksPerBasketCount"/>
    60 60 
             <property name="timeBetweenHooks" access="field" type="java.lang.Long" column="timeBetweenHooks"/>
    ... ... @@ -62,7 +62,7 @@
    62 62 
                 <column default="false" name="shooterUsed"/>
    63 63 
             </property>
    64 64 
             <property name="shooterSpeed" access="field" type="java.lang.Float">
    65 
    -            <column name="shooterSpeed" sql-type="numeric"/>
    65 
    +            <column name="shooterSpeed" precision="6" scale="4" sql-type="numeric"/>
    66 66 
             </property>
    67 67 
             <property name="maxDepthTargeted" access="field" type="java.lang.Float">
    68 68 
                 <column name="maxDepthTargeted" precision="6" scale="4" sql-type="numeric"/>

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SizeMeasureImpl.hbm.xml
    ... ... @@ -36,7 +36,7 @@
    36 36 
             </property>
    37 37 
             <property name="homeId" access="field" type="java.lang.String" column="homeId"/>
    38 38 
             <property name="size" access="field" type="java.lang.Float" not-null="true">
    39 
    -            <column name="size" sql-type="numeric"/>
    39 
    +            <column name="size" precision="6" scale="4" sql-type="numeric"/>
    40 40 
             </property>
    41 41 
             <many-to-one name="sizeMeasureType" class="fr.ird.observe.entities.referential.common.SizeMeasureTypeImpl" column="sizeMeasureType" foreign-key="fk_ll_observation_sizemeasure_sizemeasuretype" not-null="true" />
    42 42 
         </class>

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/TdrImpl.hbm.xml
    ... ... @@ -36,10 +36,10 @@
    36 36 
             </property>
    37 37 
             <property name="homeId" access="field" type="java.lang.String" column="homeId"/>
    38 38 
             <property name="floatline1Length" access="field" type="java.lang.Float">
    39 
    -            <column name="floatline1Length" sql-type="numeric"/>
    39 
    +            <column name="floatline1Length" precision="6" scale="4" sql-type="numeric"/>
    40 40 
             </property>
    41 41 
             <property name="floatline2Length" access="field" type="java.lang.Float">
    42 
    -            <column name="floatline2Length" sql-type="numeric"/>
    42 
    +            <column name="floatline2Length" precision="6" scale="4" sql-type="numeric"/>
    43 43 
             </property>
    44 44 
             <property name="serialNo" access="field" type="java.lang.String" column="serialNo"/>
    45 45 
             <property name="data" access="field" type="java.sql.Blob" column="data"/>
    ... ... @@ -58,28 +58,28 @@
    58 58 
                 <column name="fishingEnd" sql-type="timestamp"/>
    59 59 
             </property>
    60 60 
             <property name="fishingStartDepth" access="field" type="java.lang.Float">
    61 
    -            <column name="fishingStartDepth" sql-type="numeric"/>
    61 
    +            <column name="fishingStartDepth" precision="6" scale="2" sql-type="numeric"/>
    62 62 
             </property>
    63 63 
             <property name="fishingEndDepth" access="field" type="java.lang.Float">
    64 
    -            <column name="fishingEndDepth" sql-type="numeric"/>
    64 
    +            <column name="fishingEndDepth" precision="6" scale="2" sql-type="numeric"/>
    65 65 
             </property>
    66 66 
             <property name="meanDeploymentDepth" access="field" type="java.lang.Float">
    67 
    -            <column name="meanDeploymentDepth" sql-type="numeric"/>
    67 
    +            <column name="meanDeploymentDepth" precision="6" scale="2" sql-type="numeric"/>
    68 68 
             </property>
    69 69 
             <property name="medianDeploymentDepth" access="field" type="java.lang.Float">
    70 
    -            <column name="medianDeploymentDepth" sql-type="numeric"/>
    70 
    +            <column name="medianDeploymentDepth" precision="6" scale="2" sql-type="numeric"/>
    71 71 
             </property>
    72 72 
             <property name="minFishingDepth" access="field" type="java.lang.Float">
    73 
    -            <column name="minFishingDepth" sql-type="numeric"/>
    73 
    +            <column name="minFishingDepth" precision="6" scale="2" sql-type="numeric"/>
    74 74 
             </property>
    75 75 
             <property name="maxFishingDepth" access="field" type="java.lang.Float">
    76 
    -            <column name="maxFishingDepth" sql-type="numeric"/>
    76 
    +            <column name="maxFishingDepth" precision="6" scale="2" sql-type="numeric"/>
    77 77 
             </property>
    78 78 
             <property name="meanFishingDepth" access="field" type="java.lang.Float">
    79 
    -            <column name="meanFishingDepth" sql-type="numeric"/>
    79 
    +            <column name="meanFishingDepth" precision="6" scale="2" sql-type="numeric"/>
    80 80 
             </property>
    81 81 
             <property name="medianFishingDepth" access="field" type="java.lang.Float">
    82 
    -            <column name="medianFishingDepth" sql-type="numeric"/>
    82 
    +            <column name="medianFishingDepth" precision="6" scale="2" sql-type="numeric"/>
    83 83 
             </property>
    84 84 
             <many-to-one name="section" class="fr.ird.observe.entities.data.ll.observation.SectionImpl" column="section" foreign-key="fk_ll_observation_tdr_section" />
    85 85 
             <many-to-one name="basket" class="fr.ird.observe.entities.data.ll.observation.BasketImpl" column="basket" foreign-key="fk_ll_observation_tdr_basket" />

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/WeightMeasureImpl.hbm.xml
    ... ... @@ -36,7 +36,7 @@
    36 36 
             </property>
    37 37 
             <property name="homeId" access="field" type="java.lang.String" column="homeId"/>
    38 38 
             <property name="weight" access="field" type="java.lang.Float" not-null="true">
    39 
    -            <column name="weight" sql-type="numeric"/>
    39 
    +            <column name="weight" precision="6" scale="4" sql-type="numeric"/>
    40 40 
             </property>
    41 41 
             <many-to-one name="weightMeasureType" class="fr.ird.observe.entities.referential.common.WeightMeasureTypeImpl" column="weightMeasureType" foreign-key="fk_ll_observation_weightmeasure_weightmeasuretype" not-null="true" />
    42 42 
         </class>

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/common/TripImpl.hbm.xml
    ... ... @@ -45,10 +45,10 @@
    45 45 
             <property name="timeAtSea" access="field" type="java.lang.Integer" column="timeAtSea"/>
    46 46 
             <property name="fishingTime" access="field" type="java.lang.Integer" column="fishingTime"/>
    47 47 
             <property name="landingTotalWeight" access="field" type="java.lang.Float">
    48 
    -            <column name="landingTotalWeight" sql-type="numeric"/>
    48 
    +            <column name="landingTotalWeight" precision="6" scale="3" sql-type="numeric"/>
    49 49 
             </property>
    50 50 
             <property name="localMarketTotalWeight" access="field" type="java.lang.Float">
    51 
    -            <column name="localMarketTotalWeight" sql-type="numeric"/>
    51 
    +            <column name="localMarketTotalWeight" precision="6" scale="3" sql-type="numeric"/>
    52 52 
             </property>
    53 53 
             <property name="loch" access="field" type="java.lang.Integer" column="loch"/>
    54 54 
             <property name="generalComment" access="field" type="java.lang.String" length="8192">

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/observation/NonTargetCatchReleaseImpl.hbm.xml
    ... ... @@ -39,7 +39,7 @@
    39 39 
                 <column length="8192" name="comment"/>
    40 40 
             </property>
    41 41 
             <property name="length" access="field" type="java.lang.Float">
    42 
    -            <column name="length" sql-type="numeric"/>
    42 
    +            <column name="length" precision="6" scale="3" sql-type="numeric"/>
    43 43 
             </property>
    44 44 
             <property name="count" access="field" type="java.lang.Integer" column="count" not-null="true"/>
    45 45 
             <property name="brailNumber" access="field" type="java.lang.Integer" column="brailNumber"/>

  • core/persistence/java/src/main/resources/fr/ird/observe/entities/referential/common/VesselImpl.hbm.xml
    ... ... @@ -64,7 +64,7 @@
    64 64 
                 <column name="length" precision="6" scale="2" sql-type="numeric"/>
    65 65 
             </property>
    66 66 
             <property name="capacity" access="field" type="java.lang.Float">
    67 
    -            <column name="capacity" sql-type="numeric"/>
    67 
    +            <column name="capacity" precision="6" scale="2" sql-type="numeric"/>
    68 68 
             </property>
    69 69 
             <property name="powerCv" access="field" type="java.lang.Integer" column="powerCv"/>
    70 70 
             <property name="powerKW" access="field" type="java.lang.Integer" column="powerKW"/>

  • model/src/main/models/Observe/persistence/attribute/digits.properties
    ... ... @@ -21,10 +21,23 @@
    21 21 
     ###
    22 22 
     data.ll.landing.Landing.attribute.latitude=4
    23 23 
     data.ll.landing.Landing.attribute.longitude=4
    24 
    +data.ll.landing.LandingPart.attribute.categoryMax=3
    25 
    +data.ll.landing.LandingPart.attribute.categoryMin=3
    26 
    +data.ll.landing.LandingPart.attribute.weight=3
    27 
    +data.ll.logbook.Activity.attribute.currentSpeed=1
    24 28 
     data.ll.logbook.Activity.attribute.latitude=4
    25 29 
     data.ll.logbook.Activity.attribute.longitude=4
    30 
    +data.ll.logbook.Activity.attribute.seaSurfaceTemperature=2
    31 
    +data.ll.logbook.BaitsComposition.attribute.individualWeight=3
    32 
    +data.ll.logbook.BranchlinesComposition.attribute.length=4
    33 
    +data.ll.logbook.BranchlinesComposition.attribute.tracelineLength=4
    34 
    +data.ll.logbook.Catch.attribute.beatDiameter=3
    35 
    +data.ll.logbook.Catch.attribute.totalWeight=3
    36 
    +data.ll.logbook.FloatlinesComposition.attribute.length=4
    26 37 
     data.ll.logbook.Sample.attribute.latitude=4
    27 38 
     data.ll.logbook.Sample.attribute.longitude=4
    39 
    +data.ll.logbook.SamplePart.attribute.length=1
    40 
    +data.ll.logbook.SamplePart.attribute.weight=2
    28 41 
     data.ll.logbook.Set.attribute.basketLineLength=4
    29 42 
     data.ll.logbook.Set.attribute.haulingEndLatitude=4
    30 43 
     data.ll.logbook.Set.attribute.haulingEndLongitude=4
    ... ... @@ -36,10 +49,28 @@ data.ll.logbook.Set.attribute.settingEndLatitude=4
    36 49 
     data.ll.logbook.Set.attribute.settingEndLongitude=4
    37 50 
     data.ll.logbook.Set.attribute.settingStartLatitude=4
    38 51 
     data.ll.logbook.Set.attribute.settingStartLongitude=4
    52 
    +data.ll.logbook.Set.attribute.settingVesselSpeed=3
    53 
    +data.ll.logbook.Set.attribute.shooterSpeed=3
    54 
    +data.ll.logbook.Set.attribute.snapWeight=3
    55 
    +data.ll.logbook.Set.attribute.swivelWeight=3
    39 56 
     data.ll.logbook.Set.attribute.totalLineLength=4
    40 57 
     data.ll.observation.Activity.attribute.latitude=4
    41 58 
     data.ll.observation.Activity.attribute.longitude=4
    42 59 
     data.ll.observation.Activity.attribute.seaSurfaceTemperature=2
    60 
    +data.ll.observation.BaitsComposition.attribute.individualWeight=3
    61 
    +data.ll.observation.Basket.attribute.floatline1Length=4
    62 
    +data.ll.observation.Basket.attribute.floatline2Length=4
    63 
    +data.ll.observation.Branchline.attribute.branchlineLength=4
    64 
    +data.ll.observation.Branchline.attribute.snapWeight=3
    65 
    +data.ll.observation.Branchline.attribute.swivelWeight=3
    66 
    +data.ll.observation.Branchline.attribute.tracelineLength=4
    67 
    +data.ll.observation.BranchlinesComposition.attribute.length=4
    68 
    +data.ll.observation.BranchlinesComposition.attribute.tracelineLength=4
    69 
    +data.ll.observation.Catch.attribute.beatDiameter=3
    70 
    +data.ll.observation.Catch.attribute.gonadeWeight=3
    71 
    +data.ll.observation.Catch.attribute.totalWeight=3
    72 
    +data.ll.observation.Encounter.attribute.distance=3
    73 
    +data.ll.observation.FloatlinesComposition.attribute.length=4
    43 74 
     data.ll.observation.Set.attribute.haulingEndLatitude=4
    44 75 
     data.ll.observation.Set.attribute.haulingEndLongitude=4
    45 76 
     data.ll.observation.Set.attribute.haulingStartLatitude=4
    ... ... @@ -50,6 +81,23 @@ data.ll.observation.Set.attribute.settingEndLongitude=4
    50 81 
     data.ll.observation.Set.attribute.settingStartLatitude=4
    51 82 
     data.ll.observation.Set.attribute.settingStartLongitude=4
    52 83 
     data.ll.observation.Set.attribute.settingVesselSpeed=2
    84 
    +data.ll.observation.Set.attribute.shooterSpeed=4
    85 
    +data.ll.observation.Set.attribute.snapWeight=3
    86 
    +data.ll.observation.Set.attribute.swivelWeight=3
    87 
    +data.ll.observation.SizeMeasure.attribute.size=4
    88 
    +data.ll.observation.Tdr.attribute.fishingEndDepth=2
    89 
    +data.ll.observation.Tdr.attribute.fishingStartDepth=2
    90 
    +data.ll.observation.Tdr.attribute.floatline1Length=4
    91 
    +data.ll.observation.Tdr.attribute.floatline2Length=4
    92 
    +data.ll.observation.Tdr.attribute.maxFishingDepth=2
    93 
    +data.ll.observation.Tdr.attribute.meanDeploymentDepth=2
    94 
    +data.ll.observation.Tdr.attribute.meanFishingDepth=2
    95 
    +data.ll.observation.Tdr.attribute.medianDeploymentDepth=2
    96 
    +data.ll.observation.Tdr.attribute.medianFishingDepth=2
    97 
    +data.ll.observation.Tdr.attribute.minFishingDepth=2
    98 
    +data.ll.observation.WeightMeasure.attribute.weight=4
    99 
    +data.ps.common.Trip.attribute.landingTotalWeight=3
    100 
    +data.ps.common.Trip.attribute.localMarketTotalWeight=3
    53 101 
     data.ps.landing.Landing.attribute.weight=4
    54 102 
     data.ps.localmarket.Batch.attribute.weight=4
    55 103 
     data.ps.localmarket.SampleSpeciesMeasure.attribute.sizeClass=1
    ... ... @@ -79,6 +127,7 @@ data.ps.observation.Catch.attribute.maxWeight=4
    79 127 
     data.ps.observation.Catch.attribute.meanLength=1
    80 128 
     data.ps.observation.Catch.attribute.meanWeight=2
    81 129 
     data.ps.observation.Catch.attribute.minWeight=4
    130 
    +data.ps.observation.NonTargetCatchRelease.attribute.length=3
    82 131 
     data.ps.observation.Route.attribute.endLogValue=2
    83 132 
     data.ps.observation.Route.attribute.startLogValue=2
    84 133 
     data.ps.observation.SampleMeasure.attribute.length=1
    ... ... @@ -94,6 +143,7 @@ referential.common.Species.attribute.maxLength=2
    94 143 
     referential.common.Species.attribute.maxWeight=2
    95 144 
     referential.common.Species.attribute.minLength=2
    96 145 
     referential.common.Species.attribute.minWeight=2
    146 
    +referential.common.Vessel.attribute.capacity=2
    97 147 
     referential.common.Vessel.attribute.length=2
    98 148 
     referential.common.Vessel.attribute.searchMaximum=2
    99 149 
     referential.common.Wind.attribute.maxSwellHeight=2

  • toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/ExtractTagValues.java
    ... ... @@ -24,6 +24,7 @@ package fr.ird.observe.toolkit.templates;
    24 24
    25 25 
     import fr.ird.observe.dto.WithAtLeastOneSelected;
    26 26 
     import fr.ird.observe.dto.data.NoValidationDto;
    27 
    +import fr.ird.observe.spi.ProjectPackagesDefinition;
    27 28 
     import fr.ird.observe.toolkit.templates.io.TagValuesExtractor;
    28 29 
     import fr.ird.observe.toolkit.templates.validation.ValidationTagValues;
    29 30 
     import io.ultreia.java4all.util.SortedProperties;
    ... ... @@ -35,11 +36,14 @@ import org.nuiton.eugene.models.object.ObjectModelAttribute;
    35 36 
     import org.nuiton.eugene.models.object.ObjectModelClass;
    36 37 
     import org.nuiton.eugene.models.object.ObjectModelGenerator;
    37 38 
     import org.nuiton.eugene.models.object.ObjectModelType;
    39 
    +import org.nuiton.topia.templates.TopiaExtensionTagValues;
    38 40 
     import org.nuiton.topia.templates.TopiaHibernateTagValues;
    39 41
    40 42 
     import java.io.File;
    41 43 
     import java.io.IOException;
    42 44 
     import java.io.Writer;
    45 
    +import java.net.URL;
    46 
    +import java.net.URLClassLoader;
    43 47 
     import java.nio.file.Path;
    44 48 
     import java.util.ArrayList;
    45 49 
     import java.util.List;
    ... ... @@ -55,6 +59,11 @@ import java.util.Set;
    55 59 
     @Component(role = Template.class, hint = "fr.ird.observe.toolkit.templates.ExtractTagValues")
    56 60 
     public class ExtractTagValues extends ObjectModelGenerator {
    57 61
    62 
    +    private static final Set<String> DECIMAL_TYPES = Set.of(
    63 
    +            Float.class.getSimpleName(), Float.class.getName(),
    64 
    +            Double.class.getSimpleName(), Double.class.getName()
    65 
    +    );
    66 
    +
    58 67 
         private String filePrefix;
    59 68 
         private Path outputFile;
    60 69 
         private Path resourceDirectory;
    ... ... @@ -67,6 +76,7 @@ public class ExtractTagValues extends ObjectModelGenerator {
    67 76 
             Path rootResourcePath = getConfiguration().getProperty(PROP_RESOURCE_DIRECTORY, File.class).toPath();
    68 77 
             Path rootOutputPath = getConfiguration().getProperty(PROP_OUTPUT_DIRECTORY, File.class).toPath().getParent().resolve("java");
    69 78
    79 
    +
    70 80 
             String classifier;
    71 81 
             if (packageName.contains(".dto")) {
    72 82 
                 classifier = "dto";
    ... ... @@ -78,7 +88,11 @@ public class ExtractTagValues extends ObjectModelGenerator {
    78 88 
             resourceDirectory = TagValuesExtractor.getModelPath(rootResourcePath, model, classifier);
    79 89 
             getLog().info(String.format("[%s] Will generate tag values at %s", classifier, resourceDirectory));
    80 90
    81 
    -        extractor = createExtractor(model, packageName, classifier);
    91 
    +        ProjectPackagesDefinition projectPackagesDefinition;
    92 
    +        try (URLClassLoader urlClassLoader = new URLClassLoader(new URL[]{rootResourcePath.toUri().toURL()}, getClassLoader())) {
    93 
    +            projectPackagesDefinition = ProjectPackagesDefinition.of(urlClassLoader);
    94 
    +        }
    95 
    +        extractor = createExtractor(model, packageName, classifier, projectPackagesDefinition);
    82 96 
             extractor.load(getClassLoader(), resourceDirectory);
    83 97
    84 98 
             Set<String> tagValueKeys = extractor.getModelTagValueKeys();
    ... ... @@ -88,14 +102,15 @@ public class ExtractTagValues extends ObjectModelGenerator {
    88 102 
             }
    89 103 
             extractor.store(rootOutputPath);
    90 104 
         }
    91 
    -
    92 
    -    protected TagValuesExtractor createExtractor(ObjectModel model, String packageName, String classifier) {
    105 
    +    protected TagValuesExtractor createExtractor(ObjectModel model, String packageName, String classifier, ProjectPackagesDefinition projectPackagesDefinition) {
    93 106 
             if ("persistence".equals(classifier)) {
    94 107 
                 return new TagValuesExtractor(model, packageName, classifier, getLog()) {
    108 
    +
    95 109 
                     @Override
    96 110 
                     protected void extractAttributeTagValues(ObjectModelClass aClass, ObjectModelAttribute attribute) {
    97 111 
                         super.extractAttributeTagValues(aClass, attribute);
    98 112 
                         checkDateTagValue(aClass, attribute);
    113 
    +                    checkDecimalAttribute(aClass, attribute);
    99 114 
                     }
    100 115
    101 116 
                     private void checkDateTagValue(ObjectModelClass aClass, ObjectModelAttribute attribute) {
    ... ... @@ -109,6 +124,18 @@ public class ExtractTagValues extends ObjectModelGenerator {
    109 124 
                             throw new IllegalStateException(String.format("Missing hibernateAttributeType.java.util.Date tag-value on %s#%s (you can use time, date or timestamp)", aClass.getQualifiedName(), attributeName));
    110 125 
                         }
    111 126 
                     }
    127 
    +
    128 
    +                private void checkDecimalAttribute( ObjectModelClass aClass, ObjectModelAttribute attribute) {
    129 
    +                    if (DECIMAL_TYPES.contains(attribute.getType())) {
    130 
    +                        // check if digits tag value is set
    131 
    +                        String attributeName = attribute.getName();
    132 
    +                        boolean booleanTagValue = containsAttributeTagValue(aClass, attributeName, TopiaExtensionTagValues.Store.digits.name());
    133 
    +                        if (booleanTagValue) {
    134 
    +                            return;
    135 
    +                        }
    136 
    +                        throw new IllegalStateException(String.format("Missing digits tag-value on %1$s#%2$s (you need to set it on %1$s.attribute.%2$s)", projectPackagesDefinition.getRelativeEntityPackage(aClass.getQualifiedName()).substring(1), attributeName));
    137 
    +                    }
    138 
    +                }
    112 139 
                 };
    113 140 
             }
    114 141 
             if ("dto".equals(classifier)) {

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help