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

Commits:

18 changed files:

Changes:

  • client/runner/src/main/i18n/translations/client-runner_en_GB.properties
    ... ... @@ -259,7 +259,7 @@ observe.data.ps.common.Trip.timeAtSeaFishingTime=Time at sea / fishing
    259 259 
     observe.data.ps.logbook.Activity.create.title=Create new activity
    260 260 
     observe.data.ps.logbook.WellPlan.create.activity.tip=Add missing logbook activity
    261 261 
     observe.data.ps.observation.Catch.message.will.delete.sub.data=<p>If you confirm save, some data could be deleted\!</p><p>Following species won't be to use in samples nor in releases</p><p>All samples or releases of those species will be deleted.</p>
    262 
    -observe.data.ps.observation.Catch.message.will.delete.sub.data.for.species=\nIf you delete this catch, the species (%s) will not be available for samples or non target catch released.\nSamples and non target catch released using this species (%s) will also be deleted.
    262 
    +observe.data.ps.observation.Catch.message.will.delete.sub.data.for.species=\nIf you delete this catch, the species (%s) will not be available for samples or non target catch released.\nSamples and non target catch released using this species will also be deleted.
    263 263 
     observe.error.storage.backup.local.db=Could not backup local data source
    264 264 
     observe.error.storage.close.current.db=Could not close data source
    265 265 
     observe.error.storage.close.local.db=Could not close local data source

  • client/runner/src/main/i18n/translations/client-runner_es_ES.properties
    ... ... @@ -259,7 +259,7 @@ observe.data.ps.common.Trip.timeAtSeaFishingTime=Time at sea / fishing
    259 259 
     observe.data.ps.logbook.Activity.create.title=Create new activity
    260 260 
     observe.data.ps.logbook.WellPlan.create.activity.tip=Add missing logbook activity
    261 261 
     observe.data.ps.observation.Catch.message.will.delete.sub.data=<p>¡Confirmar la eliminación de los objetos de la copia de seguridad.\!</p><p>Las especies siguientes no estarán disponibles en los muestreos/<p><p>Como consecuencia se suprimirán los muestreos siguientes</p>
    262 
    -observe.data.ps.observation.Catch.message.will.delete.sub.data.for.species=\nIf you delete this catch, the species (%s) will not be available for samples or non target catch released.\nSamples and non target catch released using this species (%s) will also be deleted. \#TODO
    262 
    +observe.data.ps.observation.Catch.message.will.delete.sub.data.for.species=\nIf you delete this catch, the species (%s) will not be available for samples or non target catch released.\nSamples and non target catch released using this species will also be deleted. \#TODO
    263 263 
     observe.error.storage.backup.local.db=Could not backup local data source \#TODO
    264 264 
     observe.error.storage.close.current.db=Could not close data source \#TODO
    265 265 
     observe.error.storage.close.local.db=Could not close local data source \#TODO

  • core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json
    ... ... @@ -3021,34 +3021,6 @@
    3021 3021 
           }
    3022 3022 
         ]
    3023 3023 
       },
    3024 
    -  {
    3025 
    -    "type": "fr.ird.observe.dto.data.ll.logbook.SetCatchDto",
    3026 
    -    "scope": "ERROR",
    3027 
    -    "context": "create",
    3028 
    -    "fields": [
    3029 
    -      {
    3030 
    -        "name": "comment",
    3031 
    -        "comments": [
    3032 
    -          "comment (if not null) is not a blank string",
    3033 
    -          "comment length <= 8192"
    3034 
    -        ]
    3035 
    -      }
    3036 
    -    ]
    3037 
    -  },
    3038 
    -  {
    3039 
    -    "type": "fr.ird.observe.dto.data.ll.logbook.SetCatchDto",
    3040 
    -    "scope": "ERROR",
    3041 
    -    "context": "update",
    3042 
    -    "fields": [
    3043 
    -      {
    3044 
    -        "name": "comment",
    3045 
    -        "comments": [
    3046 
    -          "comment (if not null) is not a blank string",
    3047 
    -          "comment length <= 8192"
    3048 
    -        ]
    3049 
    -      }
    3050 
    -    ]
    3051 
    -  },
    3052 3024 
       {
    3053 3025 
         "type": "fr.ird.observe.dto.data.ll.logbook.SetDto",
    3054 3026 
         "scope": "ERROR",
    ... ... @@ -6129,34 +6101,6 @@
    6129 6101 
           }
    6130 6102 
         ]
    6131 6103 
       },
    6132 
    -  {
    6133 
    -    "type": "fr.ird.observe.dto.data.ll.observation.SetCatchDto",
    6134 
    -    "scope": "ERROR",
    6135 
    -    "context": "create",
    6136 
    -    "fields": [
    6137 
    -      {
    6138 
    -        "name": "comment",
    6139 
    -        "comments": [
    6140 
    -          "comment (if not null) is not a blank string",
    6141 
    -          "comment length <= 8192"
    6142 
    -        ]
    6143 
    -      }
    6144 
    -    ]
    6145 
    -  },
    6146 
    -  {
    6147 
    -    "type": "fr.ird.observe.dto.data.ll.observation.SetCatchDto",
    6148 
    -    "scope": "ERROR",
    6149 
    -    "context": "update",
    6150 
    -    "fields": [
    6151 
    -      {
    6152 
    -        "name": "comment",
    6153 
    -        "comments": [
    6154 
    -          "comment (if not null) is not a blank string",
    6155 
    -          "comment length <= 8192"
    6156 
    -        ]
    6157 
    -      }
    6158 
    -    ]
    6159 
    -  },
    6160 6104 
       {
    6161 6105 
         "type": "fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto",
    6162 6106 
         "scope": "ERROR",
    ... ... @@ -6174,13 +6118,6 @@
    6174 6118 
               "branchlinesPerBasketCount is a positive number"
    6175 6119 
             ]
    6176 6120 
           },
    6177 
    -      {
    6178 
    -        "name": "comment",
    6179 
    -        "comments": [
    6180 
    -          "comment (if not null) is not a blank string",
    6181 
    -          "comment length <= 8192"
    6182 
    -        ]
    6183 
    -      },
    6184 6121 
           {
    6185 6122 
             "name": "homeId",
    6186 6123 
             "comments": [
    ... ... @@ -6212,13 +6149,6 @@
    6212 6149 
               "branchlinesPerBasketCount is a positive number"
    6213 6150 
             ]
    6214 6151 
           },
    6215 
    -      {
    6216 
    -        "name": "comment",
    6217 
    -        "comments": [
    6218 
    -          "comment (if not null) is not a blank string",
    6219 
    -          "comment length <= 8192"
    6220 
    -        ]
    6221 
    -      },
    6222 6152 
           {
    6223 6153 
             "name": "homeId",
    6224 6154 
             "comments": [
    ... ... @@ -7061,34 +6991,6 @@
    7061 6991 
           }
    7062 6992 
         ]
    7063 6993 
       },
    7064 
    -  {
    7065 
    -    "type": "fr.ird.observe.dto.data.ll.observation.SetTdrDto",
    7066 
    -    "scope": "ERROR",
    7067 
    -    "context": "create",
    7068 
    -    "fields": [
    7069 
    -      {
    7070 
    -        "name": "comment",
    7071 
    -        "comments": [
    7072 
    -          "comment (if not null) is not a blank string",
    7073 
    -          "comment length <= 8192"
    7074 
    -        ]
    7075 
    -      }
    7076 
    -    ]
    7077 
    -  },
    7078 
    -  {
    7079 
    -    "type": "fr.ird.observe.dto.data.ll.observation.SetTdrDto",
    7080 
    -    "scope": "ERROR",
    7081 
    -    "context": "update",
    7082 
    -    "fields": [
    7083 
    -      {
    7084 
    -        "name": "comment",
    7085 
    -        "comments": [
    7086 
    -          "comment (if not null) is not a blank string",
    7087 
    -          "comment length <= 8192"
    7088 
    -        ]
    7089 
    -      }
    7090 
    -    ]
    7091 
    -  },
    7092 6994 
       {
    7093 6995 
         "type": "fr.ird.observe.dto.data.ll.observation.SizeMeasureDto",
    7094 6996 
         "scope": "ERROR",
    ... ... @@ -14560,13 +14462,6 @@
    14560 14462 
             "comments": [
    14561 14463 
               "check unique value on catches for tuple species,speciesFate,reasonForDiscard,weightMeasureMethod,minWeight,maxWeight,meanWeight,meanLength,well,informationSource"
    14562 14464 
             ]
    14563 
    -      },
    14564 
    -      {
    14565 
    -        "name": "comment",
    14566 
    -        "comments": [
    14567 
    -          "comment (if not null) is not a blank string",
    14568 
    -          "comment length <= 8192"
    14569 
    -        ]
    14570 14465 
           }
    14571 14466 
         ]
    14572 14467 
       },
    ... ... @@ -14580,13 +14475,6 @@
    14580 14475 
             "comments": [
    14581 14476 
               "check unique value on catches for tuple species,speciesFate,reasonForDiscard,weightMeasureMethod,minWeight,maxWeight,meanWeight,meanLength,well,informationSource"
    14582 14477 
             ]
    14583 
    -      },
    14584 
    -      {
    14585 
    -        "name": "comment",
    14586 
    -        "comments": [
    14587 
    -          "comment (if not null) is not a blank string",
    14588 
    -          "comment length <= 8192"
    14589 
    -        ]
    14590 14478 
           }
    14591 14479 
         ]
    14592 14480 
       },
    ... ... @@ -14902,34 +14790,6 @@
    14902 14790 
           }
    14903 14791 
         ]
    14904 14792 
       },
    14905 
    -  {
    14906 
    -    "type": "fr.ird.observe.dto.data.ps.observation.SetNonTargetCatchReleaseDto",
    14907 
    -    "scope": "ERROR",
    14908 
    -    "context": "create",
    14909 
    -    "fields": [
    14910 
    -      {
    14911 
    -        "name": "comment",
    14912 
    -        "comments": [
    14913 
    -          "comment (if not null) is not a blank string",
    14914 
    -          "comment length <= 8192"
    14915 
    -        ]
    14916 
    -      }
    14917 
    -    ]
    14918 
    -  },
    14919 
    -  {
    14920 
    -    "type": "fr.ird.observe.dto.data.ps.observation.SetNonTargetCatchReleaseDto",
    14921 
    -    "scope": "ERROR",
    14922 
    -    "context": "update",
    14923 
    -    "fields": [
    14924 
    -      {
    14925 
    -        "name": "comment",
    14926 
    -        "comments": [
    14927 
    -          "comment (if not null) is not a blank string",
    14928 
    -          "comment length <= 8192"
    14929 
    -        ]
    14930 
    -      }
    14931 
    -    ]
    14932 
    -  },
    14933 14793 
       {
    14934 14794 
         "type": "fr.ird.observe.dto.data.ps.observation.SetSchoolEstimateDto",
    14935 14795 
         "scope": "ERROR",

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetCatchDto-create-error-validation.xml deleted
    1 
    -<!--
    2 
    -  #%L
    3 
    -  ObServe Core :: API :: Validation
    4 
    -  %%
    5 
    -  Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    -  %%
    7 
    -  This program is free software: you can redistribute it and/or modify
    8 
    -  it under the terms of the GNU General Public License as
    9 
    -  published by the Free Software Foundation, either version 3 of the
    10 
    -  License, or (at your option) any later version.
    11 
    -
    12 
    -  This program is distributed in the hope that it will be useful,
    13 
    -  but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    -  GNU General Public License for more details.
    16 
    -
    17 
    -  You should have received a copy of the GNU General Public
    18 
    -  License along with this program.  If not, see
    19 
    -  <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    -  #L%
    21 
    -  -->
    22 
    -<!DOCTYPE validators PUBLIC
    23 
    -    "-//Apache Struts//XWork Validator 1.0.3//EN"
    24 
    -    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 
    -<validators>
    26 
    -
    27 
    -  <field name="comment">
    28 
    -    <!-- comment (if not null) is not a blank string -->
    29 
    -    <field-validator type="notBlankString" short-circuit="true">
    30 
    -      <message/>
    31 
    -    </field-validator>
    32 
    -
    33 
    -    <!-- comment length <= 8192 -->
    34 
    -    <field-validator type="stringMaxLength">
    35 
    -      <param name="maxLength">8192</param>
    36 
    -      <message/>
    37 
    -    </field-validator>
    38 
    -  </field>
    39 
    -
    40 
    -</validators>

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetCatchDto-update-error-validation.xml deleted
    1 
    -<!--
    2 
    -  #%L
    3 
    -  ObServe Core :: API :: Validation
    4 
    -  %%
    5 
    -  Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    -  %%
    7 
    -  This program is free software: you can redistribute it and/or modify
    8 
    -  it under the terms of the GNU General Public License as
    9 
    -  published by the Free Software Foundation, either version 3 of the
    10 
    -  License, or (at your option) any later version.
    11 
    -
    12 
    -  This program is distributed in the hope that it will be useful,
    13 
    -  but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    -  GNU General Public License for more details.
    16 
    -
    17 
    -  You should have received a copy of the GNU General Public
    18 
    -  License along with this program.  If not, see
    19 
    -  <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    -  #L%
    21 
    -  -->
    22 
    -<!DOCTYPE validators PUBLIC
    23 
    -    "-//Apache Struts//XWork Validator 1.0.3//EN"
    24 
    -    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 
    -<validators>
    26 
    -
    27 
    -  <field name="comment">
    28 
    -    <!-- comment (if not null) is not a blank string -->
    29 
    -    <field-validator type="notBlankString" short-circuit="true">
    30 
    -      <message/>
    31 
    -    </field-validator>
    32 
    -
    33 
    -    <!-- comment length <= 8192 -->
    34 
    -    <field-validator type="stringMaxLength">
    35 
    -      <param name="maxLength">8192</param>
    36 
    -      <message/>
    37 
    -    </field-validator>
    38 
    -  </field>
    39 
    -
    40 
    -</validators>

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetCatchDto-create-error-validation.xml deleted
    1 
    -<!--
    2 
    -  #%L
    3 
    -  ObServe Core :: API :: Validation
    4 
    -  %%
    5 
    -  Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    -  %%
    7 
    -  This program is free software: you can redistribute it and/or modify
    8 
    -  it under the terms of the GNU General Public License as
    9 
    -  published by the Free Software Foundation, either version 3 of the
    10 
    -  License, or (at your option) any later version.
    11 
    -
    12 
    -  This program is distributed in the hope that it will be useful,
    13 
    -  but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    -  GNU General Public License for more details.
    16 
    -
    17 
    -  You should have received a copy of the GNU General Public
    18 
    -  License along with this program.  If not, see
    19 
    -  <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    -  #L%
    21 
    -  -->
    22 
    -<!DOCTYPE validators PUBLIC
    23 
    -    "-//Apache Struts//XWork Validator 1.0.3//EN"
    24 
    -    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 
    -<validators>
    26 
    -
    27 
    -  <field name="comment">
    28 
    -    <!-- comment (if not null) is not a blank string -->
    29 
    -    <field-validator type="notBlankString" short-circuit="true">
    30 
    -      <message/>
    31 
    -    </field-validator>
    32 
    -
    33 
    -    <!-- comment length <= 8192 -->
    34 
    -    <field-validator type="stringMaxLength">
    35 
    -      <param name="maxLength">8192</param>
    36 
    -      <message/>
    37 
    -    </field-validator>
    38 
    -  </field>
    39 
    -
    40 
    -</validators>

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetCatchDto-update-error-validation.xml deleted
    1 
    -<!--
    2 
    -  #%L
    3 
    -  ObServe Core :: API :: Validation
    4 
    -  %%
    5 
    -  Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    -  %%
    7 
    -  This program is free software: you can redistribute it and/or modify
    8 
    -  it under the terms of the GNU General Public License as
    9 
    -  published by the Free Software Foundation, either version 3 of the
    10 
    -  License, or (at your option) any later version.
    11 
    -
    12 
    -  This program is distributed in the hope that it will be useful,
    13 
    -  but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    -  GNU General Public License for more details.
    16 
    -
    17 
    -  You should have received a copy of the GNU General Public
    18 
    -  License along with this program.  If not, see
    19 
    -  <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    -  #L%
    21 
    -  -->
    22 
    -<!DOCTYPE validators PUBLIC
    23 
    -    "-//Apache Struts//XWork Validator 1.0.3//EN"
    24 
    -    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 
    -<validators>
    26 
    -
    27 
    -  <field name="comment">
    28 
    -    <!-- comment (if not null) is not a blank string -->
    29 
    -    <field-validator type="notBlankString" short-circuit="true">
    30 
    -      <message/>
    31 
    -    </field-validator>
    32 
    -
    33 
    -    <!-- comment length <= 8192 -->
    34 
    -    <field-validator type="stringMaxLength">
    35 
    -      <param name="maxLength">8192</param>
    36 
    -      <message/>
    37 
    -    </field-validator>
    38 
    -  </field>
    39 
    -
    40 
    -</validators>

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDetailCompositionDto-create-error-validation.xml
    ... ... @@ -38,19 +38,6 @@
    38 38 
         </field-validator>
    39 39 
       </field>
    40 40
    41 
    -  <field name="comment">
    42 
    -    <!-- comment (if not null) is not a blank string -->
    43 
    -    <field-validator type="notBlankString" short-circuit="true">
    44 
    -      <message/>
    45 
    -    </field-validator>
    46 
    -
    47 
    -    <!-- comment length <= 8192 -->
    48 
    -    <field-validator type="stringMaxLength">
    49 
    -      <param name="maxLength">8192</param>
    50 
    -      <message/>
    51 
    -    </field-validator>
    52 
    -  </field>
    53 
    -
    54 41 
       <field name="homeId">
    55 42 
         <!-- homeId (if not null) is not a blank string -->
    56 43 
         <field-validator type="notBlankString" short-circuit="true">

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDetailCompositionDto-update-error-validation.xml
    ... ... @@ -38,19 +38,6 @@
    38 38 
         </field-validator>
    39 39 
       </field>
    40 40
    41 
    -  <field name="comment">
    42 
    -    <!-- comment (if not null) is not a blank string -->
    43 
    -    <field-validator type="notBlankString" short-circuit="true">
    44 
    -      <message/>
    45 
    -    </field-validator>
    46 
    -
    47 
    -    <!-- comment length <= 8192 -->
    48 
    -    <field-validator type="stringMaxLength">
    49 
    -      <param name="maxLength">8192</param>
    50 
    -      <message/>
    51 
    -    </field-validator>
    52 
    -  </field>
    53 
    -
    54 41 
       <field name="homeId">
    55 42 
         <!-- homeId (if not null) is not a blank string -->
    56 43 
         <field-validator type="notBlankString" short-circuit="true">

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetTdrDto-create-error-validation.xml deleted
    1 
    -<!--
    2 
    -  #%L
    3 
    -  ObServe Core :: API :: Validation
    4 
    -  %%
    5 
    -  Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    -  %%
    7 
    -  This program is free software: you can redistribute it and/or modify
    8 
    -  it under the terms of the GNU General Public License as
    9 
    -  published by the Free Software Foundation, either version 3 of the
    10 
    -  License, or (at your option) any later version.
    11 
    -
    12 
    -  This program is distributed in the hope that it will be useful,
    13 
    -  but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    -  GNU General Public License for more details.
    16 
    -
    17 
    -  You should have received a copy of the GNU General Public
    18 
    -  License along with this program.  If not, see
    19 
    -  <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    -  #L%
    21 
    -  -->
    22 
    -<!DOCTYPE validators PUBLIC
    23 
    -    "-//Apache Struts//XWork Validator 1.0.3//EN"
    24 
    -    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 
    -<validators>
    26 
    -
    27 
    -  <field name="comment">
    28 
    -    <!-- comment (if not null) is not a blank string -->
    29 
    -    <field-validator type="notBlankString" short-circuit="true">
    30 
    -      <message/>
    31 
    -    </field-validator>
    32 
    -
    33 
    -    <!-- comment length <= 8192 -->
    34 
    -    <field-validator type="stringMaxLength">
    35 
    -      <param name="maxLength">8192</param>
    36 
    -      <message/>
    37 
    -    </field-validator>
    38 
    -  </field>
    39 
    -
    40 
    -</validators>

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetTdrDto-update-error-validation.xml deleted
    1 
    -<!--
    2 
    -  #%L
    3 
    -  ObServe Core :: API :: Validation
    4 
    -  %%
    5 
    -  Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    -  %%
    7 
    -  This program is free software: you can redistribute it and/or modify
    8 
    -  it under the terms of the GNU General Public License as
    9 
    -  published by the Free Software Foundation, either version 3 of the
    10 
    -  License, or (at your option) any later version.
    11 
    -
    12 
    -  This program is distributed in the hope that it will be useful,
    13 
    -  but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    -  GNU General Public License for more details.
    16 
    -
    17 
    -  You should have received a copy of the GNU General Public
    18 
    -  License along with this program.  If not, see
    19 
    -  <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    -  #L%
    21 
    -  -->
    22 
    -<!DOCTYPE validators PUBLIC
    23 
    -    "-//Apache Struts//XWork Validator 1.0.3//EN"
    24 
    -    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 
    -<validators>
    26 
    -
    27 
    -  <field name="comment">
    28 
    -    <!-- comment (if not null) is not a blank string -->
    29 
    -    <field-validator type="notBlankString" short-circuit="true">
    30 
    -      <message/>
    31 
    -    </field-validator>
    32 
    -
    33 
    -    <!-- comment length <= 8192 -->
    34 
    -    <field-validator type="stringMaxLength">
    35 
    -      <param name="maxLength">8192</param>
    36 
    -      <message/>
    37 
    -    </field-validator>
    38 
    -  </field>
    39 
    -
    40 
    -</validators>

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetCatchDto-create-error-validation.xml
    ... ... @@ -31,17 +31,4 @@
    31 31 
         </field-validator>
    32 32 
       </field>
    33 33
    34 
    -  <field name="comment">
    35 
    -    <!-- comment (if not null) is not a blank string -->
    36 
    -    <field-validator type="notBlankString" short-circuit="true">
    37 
    -      <message/>
    38 
    -    </field-validator>
    39 
    -
    40 
    -    <!-- comment length <= 8192 -->
    41 
    -    <field-validator type="stringMaxLength">
    42 
    -      <param name="maxLength">8192</param>
    43 
    -      <message/>
    44 
    -    </field-validator>
    45 
    -  </field>
    46 
    -
    47 34 
     </validators>

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetCatchDto-update-error-validation.xml
    ... ... @@ -31,17 +31,4 @@
    31 31 
         </field-validator>
    32 32 
       </field>
    33 33
    34 
    -  <field name="comment">
    35 
    -    <!-- comment (if not null) is not a blank string -->
    36 
    -    <field-validator type="notBlankString" short-circuit="true">
    37 
    -      <message/>
    38 
    -    </field-validator>
    39 
    -
    40 
    -    <!-- comment length <= 8192 -->
    41 
    -    <field-validator type="stringMaxLength">
    42 
    -      <param name="maxLength">8192</param>
    43 
    -      <message/>
    44 
    -    </field-validator>
    45 
    -  </field>
    46 
    -
    47 34 
     </validators>

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetNonTargetCatchReleaseDto-create-error-validation.xml deleted
    1 
    -<!--
    2 
    -  #%L
    3 
    -  ObServe Core :: API :: Validation
    4 
    -  %%
    5 
    -  Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    -  %%
    7 
    -  This program is free software: you can redistribute it and/or modify
    8 
    -  it under the terms of the GNU General Public License as
    9 
    -  published by the Free Software Foundation, either version 3 of the
    10 
    -  License, or (at your option) any later version.
    11 
    -
    12 
    -  This program is distributed in the hope that it will be useful,
    13 
    -  but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    -  GNU General Public License for more details.
    16 
    -
    17 
    -  You should have received a copy of the GNU General Public
    18 
    -  License along with this program.  If not, see
    19 
    -  <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    -  #L%
    21 
    -  -->
    22 
    -<!DOCTYPE validators PUBLIC
    23 
    -    "-//Apache Struts//XWork Validator 1.0.3//EN"
    24 
    -    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 
    -<validators>
    26 
    -
    27 
    -  <field name="comment">
    28 
    -    <!-- comment (if not null) is not a blank string -->
    29 
    -    <field-validator type="notBlankString" short-circuit="true">
    30 
    -      <message/>
    31 
    -    </field-validator>
    32 
    -
    33 
    -    <!-- comment length <= 8192 -->
    34 
    -    <field-validator type="stringMaxLength">
    35 
    -      <param name="maxLength">8192</param>
    36 
    -      <message/>
    37 
    -    </field-validator>
    38 
    -  </field>
    39 
    -
    40 
    -</validators>

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetNonTargetCatchReleaseDto-update-error-validation.xml deleted
    1 
    -<!--
    2 
    -  #%L
    3 
    -  ObServe Core :: API :: Validation
    4 
    -  %%
    5 
    -  Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    -  %%
    7 
    -  This program is free software: you can redistribute it and/or modify
    8 
    -  it under the terms of the GNU General Public License as
    9 
    -  published by the Free Software Foundation, either version 3 of the
    10 
    -  License, or (at your option) any later version.
    11 
    -
    12 
    -  This program is distributed in the hope that it will be useful,
    13 
    -  but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    -  GNU General Public License for more details.
    16 
    -
    17 
    -  You should have received a copy of the GNU General Public
    18 
    -  License along with this program.  If not, see
    19 
    -  <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    -  #L%
    21 
    -  -->
    22 
    -<!DOCTYPE validators PUBLIC
    23 
    -    "-//Apache Struts//XWork Validator 1.0.3//EN"
    24 
    -    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 
    -<validators>
    26 
    -
    27 
    -  <field name="comment">
    28 
    -    <!-- comment (if not null) is not a blank string -->
    29 
    -    <field-validator type="notBlankString" short-circuit="true">
    30 
    -      <message/>
    31 
    -    </field-validator>
    32 
    -
    33 
    -    <!-- comment length <= 8192 -->
    34 
    -    <field-validator type="stringMaxLength">
    35 
    -      <param name="maxLength">8192</param>
    36 
    -      <message/>
    37 
    -    </field-validator>
    38 
    -  </field>
    39 
    -
    40 
    -</validators>

  • core/api/validation/src/test/resources/fixtures/api-validation.properties
    ... ... @@ -21,7 +21,7 @@
    21 21 
     ###
    22 22 
     # for fr.ird.observe.dto.validation.BeanValidatorDetectorTest
    23 23 
     VALIDATORS_REFERENTIAL_COUNT=182
    24 
    -VALIDATORS_DATA_COUNT=184
    24 
    +VALIDATORS_DATA_COUNT=176
    25 25 
     VALIDATOR_UPDATE_EXTRA_CREATE_DATA_COUNT=8
    26 26 
     # for fr.ird.observe.dto.validation.ValidatorMapBuilderTest
    27 27 
     VALIDATOR_MAP_DATA_COUNT=130

  • core/api/validation/src/test/resources/fixtures/validation/bean-validator-detector-n1-create.list
    ... ... @@ -13,7 +13,6 @@ ll.logbook.FloatlinesCompositionDto
    13 13 
     ll.logbook.HooksCompositionDto
    14 14 
     ll.logbook.SampleDto
    15 15 
     ll.logbook.SamplePartDto
    16 
    -ll.logbook.SetCatchDto
    17 16 
     ll.logbook.SetDto
    18 17 
     ll.logbook.SetGlobalCompositionDto
    19 18 
     ll.observation.ActivityDto
    ... ... @@ -29,11 +28,9 @@ ll.observation.FloatlinesCompositionDto
    29 28 
     ll.observation.HooksCompositionDto
    30 29 
     ll.observation.SectionDto
    31 30 
     ll.observation.SensorUsedDto
    32 
    -ll.observation.SetCatchDto
    33 31 
     ll.observation.SetDetailCompositionDto
    34 32 
     ll.observation.SetDto
    35 33 
     ll.observation.SetGlobalCompositionDto
    36 
    -ll.observation.SetTdrDto
    37 34 
     ll.observation.SizeMeasureDto
    38 35 
     ll.observation.TdrDto
    39 36 
     ll.observation.WeightMeasureDto
    ... ... @@ -83,7 +80,6 @@ ps.observation.SampleMeasureDto
    83 80 
     ps.observation.SchoolEstimateDto
    84 81 
     ps.observation.SetCatchDto
    85 82 
     ps.observation.SetDto
    86 
    -ps.observation.SetNonTargetCatchReleaseDto
    87 83 
     ps.observation.SetSchoolEstimateDto
    88 84 
     ps.observation.TransmittingBuoyDto
    89 85 
     common.CountryDto

  • core/api/validation/src/test/resources/fixtures/validation/bean-validator-detector-n1-update.list
    ... ... @@ -13,7 +13,6 @@ ll.logbook.FloatlinesCompositionDto
    13 13 
     ll.logbook.HooksCompositionDto
    14 14 
     ll.logbook.SampleDto
    15 15 
     ll.logbook.SamplePartDto
    16 
    -ll.logbook.SetCatchDto
    17 16 
     ll.logbook.SetDto
    18 17 
     ll.logbook.SetGlobalCompositionDto
    19 18 
     ll.observation.ActivityDto
    ... ... @@ -29,11 +28,9 @@ ll.observation.FloatlinesCompositionDto
    29 28 
     ll.observation.HooksCompositionDto
    30 29 
     ll.observation.SectionDto
    31 30 
     ll.observation.SensorUsedDto
    32 
    -ll.observation.SetCatchDto
    33 31 
     ll.observation.SetDetailCompositionDto
    34 32 
     ll.observation.SetDto
    35 33 
     ll.observation.SetGlobalCompositionDto
    36 
    -ll.observation.SetTdrDto
    37 34 
     ll.observation.SizeMeasureDto
    38 35 
     ll.observation.TdrDto
    39 36 
     ll.observation.WeightMeasureDto
    ... ... @@ -83,7 +80,6 @@ ps.observation.SampleMeasureDto
    83 80 
     ps.observation.SchoolEstimateDto
    84 81 
     ps.observation.SetCatchDto
    85 82 
     ps.observation.SetDto
    86 
    -ps.observation.SetNonTargetCatchReleaseDto
    87 83 
     ps.observation.SetSchoolEstimateDto
    88 84 
     ps.observation.TransmittingBuoyDto
    89 85 
     common.CountryDto

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