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

Commits:

3 changed files:

Changes:

  • test/src/main/java/fr/ird/observe/test/ObserveFixtures.java
    ... ... @@ -68,14 +68,14 @@ public class ObserveFixtures {
    68 68
         public static final int REFERENTIAL_FORM_COUNT = ENTITY_BINDER_REFERENTIAL_COUNT;
    
    69 69
         public static final int DATA_FORM_COUNT = 47;
    
    70 70
     
    
    71
    -    public static final int VALIDATORS_COUNT = 53;//90;
    
    71
    +    public static final int VALIDATORS_COUNT = 54;//90;
    
    72 72
         public static final int VALIDATOR_CREATE_DATA_COUNT = 9; //8;
    
    73 73
         //    public static final int VALIDATOR_CREATE_ENTITY_DATA_COUNT = 33;
    
    74 74
         public static final int VALIDATOR_CREATE_ENTITY_DATA_COUNT_REAL = 112;
    
    75 75
         public static final int VALIDATOR_UPDATE_DATA_COUNT = 23;//32;
    
    76 76
         //    public static final int VALIDATOR_UPDATE_ENTITY_DATA_COUNT = 35;
    
    77 77
         public static final int VALIDATOR_UPDATE_ENTITY_DATA_COUNT_REAL = 113;
    
    78
    -    public static final int VALIDATOR_UPDATE_REFERENTIAL_COUNT = 4;//17;
    
    78
    +    public static final int VALIDATOR_UPDATE_REFERENTIAL_COUNT = 5;//17;
    
    79 79
         public static final int VALIDATOR_UPDATE_REFERENTIAL_COUNT_REAL = 66;
    
    80 80
         public static final int VALIDATOR_CREATE_REFERENTIAL_COUNT = 4;//18;
    
    81 81
         public static final int VALIDATOR_CREATE_REFERENTIAL_COUNT_REAL = 66;
    

  • validation/src/main/resources/fr/ird/observe/dto/referential/seine/TransmittingBuoyTypeDto-update-error-validation.xml
    1
    +<!--
    
    2
    +  #%L
    
    3
    +  ObServe :: Validation
    
    4
    +  %%
    
    5
    +  Copyright (C) 2008 - 2020 IRD, Code Lutin, 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
    +  <field name="technology">
    
    27
    +    <field-validator type="commentLengthFieldDto">
    
    28
    +      <message>observe.validation.technology.too.big##${maxLength}##${commentLength}</message>
    
    29
    +    </field-validator>
    
    30
    +  </field>
    
    31
    +
    
    32
    +</validators>

  • validation/src/test/java/fr/ird/observe/validation/BeanValidatorDetectorTest.java
    ... ... @@ -204,6 +204,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest {
    204 204
                                                    TargetLengthDto.class,
    
    205 205
                                                    TdrDto.class,
    
    206 206
     //                                               TransmittingBuoyDto.class,
    
    207
    +                                               TransmittingBuoyTypeDto.class,
    
    207 208
                                                    TripLonglineDto.class,
    
    208 209
     //                                               TripLonglineGearUseDto.class,
    
    209 210
                                                    TripSeineDto.class);