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

Commits:

9 changed files:

Changes:

  • client-configuration/src/main/resources/log4j2.xml
    ... ... @@ -18,8 +18,7 @@
    18 18 
       <http://www.gnu.org/licenses/gpl-3.0.html>.
    19 19 
       #L%
    20 20 
       -->
    21 
    -
    22 
    -<Configuration status="error">
    21 
    +<Configuration strict="true" status="error">
    23 22 
       <Appenders>
    24 23 
         <Console name="console" target="SYSTEM_OUT">
    25 24 
           <PatternLayout pattern="%-5p %d{ISO8601} [%t] %40C{1} :%4L - %m%n"/>
    ... ... @@ -35,53 +34,49 @@
    35 34 
         </RollingFile>
    36 35 
       </Appenders>
    37 36 
       <Loggers>
    38 
    -    <Root level="warn">
    39 
    -      <AppenderRef ref="console"/>
    40 
    -      <AppenderRef ref="File"/>
    41 
    -    </Root>
    42 
    -    <Logger name="fr.ird.observe" level="info" additivity="false">
    37 
    +    <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false">
    43 38 
           <AppenderRef ref="console"/>
    44 39 
           <AppenderRef ref="File"/>
    45 40 
         </Logger>
    46 
    -    <Logger name="org.nuiton" level="warn" additivity="false">
    41 
    +    <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false">
    47 42 
           <AppenderRef ref="console"/>
    48 43 
           <AppenderRef ref="File"/>
    49 44 
         </Logger>
    50 
    -    <Logger name="org.nuiton.topia" level="info" additivity="false">
    45 
    +    <Logger name="org.nuiton.validator.xwork2.XWork2ScopeValidator" level="warn" additivity="false">
    51 46 
           <AppenderRef ref="console"/>
    52 47 
           <AppenderRef ref="File"/>
    53 48 
         </Logger>
    54 
    -    <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
    49 
    +    <Logger name="com.opensymphony.xwork2.validator.validators" level="warn" additivity="false">
    55 50 
           <AppenderRef ref="console"/>
    56 51 
           <AppenderRef ref="File"/>
    57 52 
         </Logger>
    58 
    -    <Logger name="io.ultreia" level="info" additivity="false">
    53 
    +    <Logger name="org.nuiton.validator.xwork2.field" level="warn" additivity="false">
    59 54 
           <AppenderRef ref="console"/>
    60 55 
           <AppenderRef ref="File"/>
    61 56 
         </Logger>
    62 
    -    <Logger name="org.hibernate" level="warn" additivity="false">
    57 
    +    <Logger name="fr.ird.observe.spi.DtoModelHelper" level="warn" additivity="false">
    63 58 
           <AppenderRef ref="console"/>
    64 59 
           <AppenderRef ref="File"/>
    65 60 
         </Logger>
    66 
    -    <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false">
    61 
    +    <Logger name="org.nuiton.topia" level="warn" additivity="false">
    67 62 
           <AppenderRef ref="console"/>
    68 63 
           <AppenderRef ref="File"/>
    69 64 
         </Logger>
    70 
    -    <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false">
    65 
    +    <Logger name="org.hibernate" level="warn" additivity="false">
    71 66 
           <AppenderRef ref="console"/>
    72 67 
           <AppenderRef ref="File"/>
    73 68 
         </Logger>
    74 
    -    <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false">
    69 
    +    <Logger name="fr.ird.observe.services.service.referential.differential.DifferentialModel" level="warn" additivity="false">
    75 70 
           <AppenderRef ref="console"/>
    76 71 
           <AppenderRef ref="File"/>
    77 72 
         </Logger>
    78 
    -    <Logger name="com.opensymphony.xwork2.validator.validators" level="error" additivity="false">
    73 
    +    <Logger name="fr.ird.observe" level="info" additivity="false">
    79 74 
           <AppenderRef ref="console"/>
    80 75 
           <AppenderRef ref="File"/>
    81 76 
         </Logger>
    82 
    -    <Logger name="org.nuiton.validator.xwork2.field" level="error" additivity="false">
    77 
    +    <Root level="error">
    83 78 
           <AppenderRef ref="console"/>
    84 79 
           <AppenderRef ref="File"/>
    85 
    -    </Logger>
    80 
    +    </Root>
    86 81 
       </Loggers>
    87 
    -</Configuration>
    82 
    +</Configuration>
    \ No newline at end of file

  • client-configuration/src/main/resources/observe-log4j2.xml
    ... ... @@ -19,13 +19,13 @@
    19 19 
       #L%
    20 20 
       -->
    21 21
    22 
    -<Configuration status="error">
    22 
    +<Configuration strict="true" status="error">
    23 23 
       <Appenders>
    24 24 
         <Console name="console" target="SYSTEM_OUT">
    25 25 
           <PatternLayout pattern="%-5p %d{ISO8601} [%t] %40C{1} :%4L - %m%n"/>
    26 26 
         </Console>
    27 
    -    <RollingFile name="File" fileName="${log.directory}/observe-${application.version}.log"
    28 
    -                 filePattern="${log.directory}/observe-${application.version}-%d{MM-dd-yyyy}-%i.log.gz">
    27 
    +    <RollingFile name="File" fileName="${data.directory}/log/observe-${application.version}.log"
    28 
    +                 filePattern="${data.directory}/log/observe-${application.version}-%d{MM-dd-yyyy}-%i.log.gz">
    29 29 
           <PatternLayout pattern="%-5p %d{ISO8601} [%t] %40C{1} :%4L - %m%n"/>
    30 30 
           <Policies>
    31 31 
             <TimeBasedTriggeringPolicy/>
    ... ... @@ -35,31 +35,31 @@
    35 35 
         </RollingFile>
    36 36 
       </Appenders>
    37 37 
       <Loggers>
    38 
    -    <Logger name="fr.ird.observe" level="info" additivity="false">
    38 
    +    <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false">
    39 39 
           <AppenderRef ref="console"/>
    40 40 
           <AppenderRef ref="File"/>
    41 41 
         </Logger>
    42 
    -    <Logger name="org.nuiton" level="warn" additivity="false">
    42 
    +    <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false">
    43 43 
           <AppenderRef ref="console"/>
    44 44 
           <AppenderRef ref="File"/>
    45 45 
         </Logger>
    46 
    -    <Logger name="org.nuiton.i18n.editor" level="info" additivity="false">
    46 
    +    <Logger name="org.nuiton.validator.xwork2.XWork2ScopeValidator" level="warn" additivity="false">
    47 47 
           <AppenderRef ref="console"/>
    48 48 
           <AppenderRef ref="File"/>
    49 49 
         </Logger>
    50 
    -    <Logger name="org.nuiton.topia" level="info" additivity="false">
    50 
    +    <Logger name="com.opensymphony.xwork2.validator.validators" level="warn" additivity="false">
    51 51 
           <AppenderRef ref="console"/>
    52 52 
           <AppenderRef ref="File"/>
    53 53 
         </Logger>
    54 
    -    <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false">
    54 
    +    <Logger name="org.nuiton.validator.xwork2.field" level="warn" additivity="false">
    55 55 
           <AppenderRef ref="console"/>
    56 56 
           <AppenderRef ref="File"/>
    57 57 
         </Logger>
    58 
    -    <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
    58 
    +    <Logger name="fr.ird.observe.spi.DtoModelHelper" level="warn" additivity="false">
    59 59 
           <AppenderRef ref="console"/>
    60 60 
           <AppenderRef ref="File"/>
    61 61 
         </Logger>
    62 
    -    <Logger name="io.ultreia" level="info" additivity="false">
    62 
    +    <Logger name="org.nuiton.topia" level="warn" additivity="false">
    63 63 
           <AppenderRef ref="console"/>
    64 64 
           <AppenderRef ref="File"/>
    65 65 
         </Logger>
    ... ... @@ -67,29 +67,17 @@
    67 67 
           <AppenderRef ref="console"/>
    68 68 
           <AppenderRef ref="File"/>
    69 69 
         </Logger>
    70 
    -    <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false">
    71 
    -      <AppenderRef ref="console"/>
    72 
    -      <AppenderRef ref="File"/>
    73 
    -    </Logger>
    74 
    -    <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false">
    75 
    -      <AppenderRef ref="console"/>
    76 
    -      <AppenderRef ref="File"/>
    77 
    -    </Logger>
    78 
    -    <Logger name="com.opensymphony.xwork2.validator.validators" level="error" additivity="false">
    79 
    -      <AppenderRef ref="console"/>
    80 
    -      <AppenderRef ref="File"/>
    81 
    -    </Logger>
    82 
    -    <Logger name="org.nuiton.validator.xwork2.field" level="error" additivity="false">
    70 
    +    <Logger name="fr.ird.observe.services.service.referential.differential.DifferentialModel" level="warn" additivity="false">
    83 71 
           <AppenderRef ref="console"/>
    84 72 
           <AppenderRef ref="File"/>
    85 73 
         </Logger>
    86 
    -    <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false">
    74 
    +    <Logger name="fr.ird.observe" level="info" additivity="false">
    87 75 
           <AppenderRef ref="console"/>
    88 76 
           <AppenderRef ref="File"/>
    89 77 
         </Logger>
    90 
    -    <Logger name="io.ultreia.java4all.jaxx.widgets.combobox" level="info" additivity="false">
    78 
    +    <Root level="error">
    91 79 
           <AppenderRef ref="console"/>
    92 80 
           <AppenderRef ref="File"/>
    93 
    -    </Logger>
    81 
    +    </Root>
    94 82 
       </Loggers>
    95 83 
     </Configuration>

  • server-configuration/src/main/resources/log4j2.xml
    ... ... @@ -18,49 +18,45 @@
    18 18 
       <http://www.gnu.org/licenses/gpl-3.0.html>.
    19 19 
       #L%
    20 20 
       -->
    21 
    -
    22 
    -<Configuration status="error">
    21 
    +<Configuration strict="true" status="error">
    23 22 
       <Appenders>
    24 23 
         <Console name="console" target="SYSTEM_OUT">
    25 24 
           <PatternLayout pattern="%-5p %d{ISO8601} [%t] %40C{1} :%4L - %m%n"/>
    26 25 
         </Console>
    27 26 
       </Appenders>
    28 27 
       <Loggers>
    29 
    -    <Logger name="fr.ird.observe" level="info" additivity="false">
    28 
    +    <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false">
    30 29 
           <AppenderRef ref="console"/>
    31 30 
         </Logger>
    32 
    -    <Logger name="org.nuiton" level="warn" additivity="false">
    31 
    +    <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false">
    33 32 
           <AppenderRef ref="console"/>
    34 33 
         </Logger>
    35 
    -    <Logger name="org.nuiton.topia" level="info" additivity="false">
    34 
    +    <Logger name="org.nuiton.validator.xwork2.XWork2ScopeValidator" level="warn" additivity="false">
    36 35 
           <AppenderRef ref="console"/>
    37 36 
         </Logger>
    38 
    -    <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false">
    37 
    +    <Logger name="com.opensymphony.xwork2.validator.validators" level="warn" additivity="false">
    39 38 
           <AppenderRef ref="console"/>
    40 39 
         </Logger>
    41 
    -    <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
    40 
    +    <Logger name="org.nuiton.validator.xwork2.field" level="warn" additivity="false">
    42 41 
           <AppenderRef ref="console"/>
    43 42 
         </Logger>
    44 
    -    <Logger name="org.debux" level="info" additivity="false">
    43 
    +    <Logger name="fr.ird.observe.spi.DtoModelHelper" level="warn" additivity="false">
    45 44 
           <AppenderRef ref="console"/>
    46 45 
         </Logger>
    47 
    -    <Logger name="io.ultreia" level="info" additivity="false">
    46 
    +    <Logger name="org.nuiton.topia" level="warn" additivity="false">
    48 47 
           <AppenderRef ref="console"/>
    49 48 
         </Logger>
    50 
    -    <Logger name="org.hibernate" level="info" additivity="false">
    49 
    +    <Logger name="org.hibernate" level="warn" additivity="false">
    51 50 
           <AppenderRef ref="console"/>
    52 51 
         </Logger>
    53 
    -    <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false">
    52 
    +    <Logger name="fr.ird.observe.services.service.referential.differential.DifferentialModel" level="warn" additivity="false">
    54 53 
           <AppenderRef ref="console"/>
    55 54 
         </Logger>
    56 
    -    <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false">
    57 
    -      <AppenderRef ref="console"/>
    58 
    -    </Logger>
    59 
    -    <Logger name="com.opensymphony.xwork2.validator.validators" level="error" additivity="false">
    55 
    +    <Logger name="fr.ird.observe" level="info" additivity="false">
    60 56 
           <AppenderRef ref="console"/>
    61 57 
         </Logger>
    62 
    -    <Logger name="org.nuiton.validator.xwork2.field" level="error" additivity="false">
    58 
    +    <Root level="error">
    63 59 
           <AppenderRef ref="console"/>
    64 
    -    </Logger>
    60 
    +    </Root>
    65 61 
       </Loggers>
    66 
    -</Configuration>
    62 
    +</Configuration>
    \ No newline at end of file

  • server-configuration/src/main/resources/observeweb-log4j2.xml
    ... ... @@ -19,8 +19,7 @@
    19 19 
       #L%
    20 20 
       -->
    21 21
    22 
    -
    23 
    -<Configuration status="error">
    22 
    +<Configuration strict="true" status="error">
    24 23 
       <Appenders>
    25 24 
         <Console name="console" target="SYSTEM_OUT">
    26 25 
           <PatternLayout pattern="%-5p %d{ISO8601} [%t] %40C{1} :%4L - %m%n"/>
    ... ... @@ -36,31 +35,31 @@
    36 35 
         </RollingFile>
    37 36 
       </Appenders>
    38 37 
       <Loggers>
    39 
    -    <Logger name="fr.ird.observe" level="info" additivity="false">
    38 
    +    <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false">
    40 39 
           <AppenderRef ref="console"/>
    41 40 
           <AppenderRef ref="File"/>
    42 41 
         </Logger>
    43 
    -    <Logger name="org.nuiton" level="warn" additivity="false">
    42 
    +    <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false">
    44 43 
           <AppenderRef ref="console"/>
    45 44 
           <AppenderRef ref="File"/>
    46 45 
         </Logger>
    47 
    -    <Logger name="org.nuiton.topia" level="info" additivity="false">
    46 
    +    <Logger name="org.nuiton.validator.xwork2.XWork2ScopeValidator" level="warn" additivity="false">
    48 47 
           <AppenderRef ref="console"/>
    49 48 
           <AppenderRef ref="File"/>
    50 49 
         </Logger>
    51 
    -    <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false">
    50 
    +    <Logger name="com.opensymphony.xwork2.validator.validators" level="warn" additivity="false">
    52 51 
           <AppenderRef ref="console"/>
    53 52 
           <AppenderRef ref="File"/>
    54 53 
         </Logger>
    55 
    -    <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
    54 
    +    <Logger name="org.nuiton.validator.xwork2.field" level="warn" additivity="false">
    56 55 
           <AppenderRef ref="console"/>
    57 56 
           <AppenderRef ref="File"/>
    58 57 
         </Logger>
    59 
    -    <Logger name="org.debux" level="info" additivity="false">
    58 
    +    <Logger name="fr.ird.observe.spi.DtoModelHelper" level="warn" additivity="false">
    60 59 
           <AppenderRef ref="console"/>
    61 60 
           <AppenderRef ref="File"/>
    62 61 
         </Logger>
    63 
    -    <Logger name="io.ultreia" level="info" additivity="false">
    62 
    +    <Logger name="org.nuiton.topia" level="warn" additivity="false">
    64 63 
           <AppenderRef ref="console"/>
    65 64 
           <AppenderRef ref="File"/>
    66 65 
         </Logger>
    ... ... @@ -68,21 +67,17 @@
    68 67 
           <AppenderRef ref="console"/>
    69 68 
           <AppenderRef ref="File"/>
    70 69 
         </Logger>
    71 
    -    <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false">
    70 
    +    <Logger name="fr.ird.observe.services.service.referential.differential.DifferentialModel" level="warn" additivity="false">
    72 71 
           <AppenderRef ref="console"/>
    73 72 
           <AppenderRef ref="File"/>
    74 73 
         </Logger>
    75 
    -    <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false">
    76 
    -      <AppenderRef ref="console"/>
    77 
    -      <AppenderRef ref="File"/>
    78 
    -    </Logger>
    79 
    -    <Logger name="com.opensymphony.xwork2.validator.validators" level="error" additivity="false">
    74 
    +    <Logger name="fr.ird.observe" level="info" additivity="false">
    80 75 
           <AppenderRef ref="console"/>
    81 76 
           <AppenderRef ref="File"/>
    82 77 
         </Logger>
    83 
    -    <Logger name="org.nuiton.validator.xwork2.field" level="error" additivity="false">
    78 
    +    <Root level="error">
    84 79 
           <AppenderRef ref="console"/>
    85 80 
           <AppenderRef ref="File"/>
    86 
    -    </Logger>
    81 
    +    </Root>
    87 82 
       </Loggers>
    88 83 
     </Configuration>

  • services-validation/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java
    ... ... @@ -26,10 +26,13 @@ import com.opensymphony.xwork2.validator.ValidationException;
    26 26 
     import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport;
    27 27 
     import fr.ird.observe.dto.referential.common.SpeciesDto;
    28 28 
     import fr.ird.observe.dto.referential.common.SpeciesReference;
    29 
    +import io.ultreia.java4all.lang.Numbers;
    29 30 
     import org.apache.commons.lang3.StringUtils;
    30 31 
     import org.apache.logging.log4j.LogManager;
    31 32 
     import org.apache.logging.log4j.Logger;
    32 33
    34 
    +import java.util.Objects;
    35 
    +
    33 36 
     /**
    34 37 
      * <!-- START SNIPPET: javadoc -->
    35 38 
      * Ce validateur verifie qu'une espece respece bien les tailles ou
    ... ... @@ -69,7 +72,7 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup
    69 72 
          * @since 2.3
    70 73 
          */
    71 74 
         protected String expression;
    72 
    -    private boolean enable;
    75 
    +    private Boolean enable;
    73 76 
         /** le ratio a appliquer sur les bornes définies dans le référentiel */
    74 77 
         private Float ratio;
    75 78 
         private String speciesField = "species";
    ... ... @@ -84,8 +87,8 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup
    84 87 
             this.speciesField = speciesField;
    85 88 
         }
    86 89
    87 
    -    public void setRatio(float ratio) {
    88 
    -        this.ratio = ratio;
    90 
    +    public void setRatio(String ratio) {
    91 
    +        this.ratio = Float.parseFloat(Objects.requireNonNull(ratio));
    89 92 
         }
    90 93
    91 94 
         public void setExpression(String expression) {
    ... ... @@ -96,8 +99,8 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup
    96 99 
             return enable;
    97 100 
         }
    98 101
    99 
    -    public void setEnable(boolean enable) {
    100 
    -        this.enable = enable;
    102 
    +    public void setEnable(String enable) {
    103 
    +        this.enable = Boolean.parseBoolean(Objects.requireNonNull(enable));
    101 104 
         }
    102 105
    103 106 
         protected abstract Float getBoundMin(SpeciesDto referentiel);
    ... ... @@ -111,9 +114,9 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup
    111 114 
         private boolean shouldValidate(Object object) throws ValidationException {
    112 115
    113 116 
             Boolean enable = (Boolean) getFieldValue("validationLengthWeightEnable", object);
    114 
    -        if (enable != null) {
    117 
    +        if (enable != null && this.enable != null) {
    115 118
    116 
    -            if (this.enable != enable) {
    119 
    +            if (!Objects.equals(this.enable, enable)) {
    117 120
    118 121 
                     if (log.isDebugEnabled()) {
    119 122 
                         log.debug("Skip speed validation");
    ... ... @@ -220,11 +223,11 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup
    220 223 
         }
    221 224
    222 225 
         public Float getMin() {
    223 
    -        return boundWithRatio.getMin();
    226 
    +        return Numbers.roundThreeDigits(boundWithRatio.getMin());
    224 227 
         }
    225 228
    226 229 
         public Float getMax() {
    227 
    -        return boundWithRatio.getMax();
    230 
    +        return Numbers.roundThreeDigits(boundWithRatio.getMax());
    228 231 
         }
    229 232
    230 233 
         private Bound getBound(SpeciesDto species) {

  • test/src/main/resources/fixtures/validate-service-seine-trips.properties
    ... ... @@ -24,7 +24,7 @@ RouteDto=3
    24 24 
     ActivityDto=11
    25 25 
     TransmittingBuoyDto=2
    26 26 
     SetDto=3
    27 
    -NonTargetCatchDto=3
    27 
    +NonTargetCatchDto=4
    28 28 
     NonTargetLengthDto=3
    29 29 
     TargetLengthDto=1
    30 30 
     FloatingObjectDto=1

  • test/src/main/resources/log4j2.xml
    ... ... @@ -19,39 +19,45 @@
    19 19 
       #L%
    20 20 
       -->
    21 21
    22 
    -<Configuration status="error">
    22 
    +<Configuration strict="true" status="warn">
    23 23 
       <Appenders>
    24 24 
         <Console name="console" target="SYSTEM_OUT">
    25 25 
           <PatternLayout pattern="%-5p %d{ISO8601} [%t] %40C{1} :%4L - %m%n"/>
    26 26 
         </Console>
    27 27 
       </Appenders>
    28 28 
       <Loggers>
    29 
    -    <Logger name="io.ultreia.java4all.application.context" level="warning" additivity="false">
    29 
    +    <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false">
    30 30 
           <AppenderRef ref="console"/>
    31 31 
         </Logger>
    32 
    -    <Logger name="io.ultreia.java4all.application" level="info" additivity="false">
    32 
    +    <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false">
    33 33 
           <AppenderRef ref="console"/>
    34 34 
         </Logger>
    35 
    -    <Logger name="fr.ird.observe" level="info" additivity="false">
    35 
    +    <Logger name="org.nuiton.validator.xwork2.XWork2ScopeValidator" level="warn" additivity="false">
    36 36 
           <AppenderRef ref="console"/>
    37 37 
         </Logger>
    38 
    -    <Logger name="org.nuiton.topia" level="info" additivity="false">
    38 
    +    <Logger name="com.opensymphony.xwork2.validator.validators" level="warn" additivity="false">
    39 39 
           <AppenderRef ref="console"/>
    40 40 
         </Logger>
    41 
    -    <Logger name="org.hibernate" level="info" additivity="false">
    41 
    +    <Logger name="org.nuiton.validator.xwork2.field" level="warn" additivity="false">
    42 42 
           <AppenderRef ref="console"/>
    43 43 
         </Logger>
    44 
    -    <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false">
    44 
    +    <Logger name="fr.ird.observe.spi.DtoModelHelper" level="warn" additivity="false">
    45 45 
           <AppenderRef ref="console"/>
    46 46 
         </Logger>
    47 
    -    <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false">
    47 
    +    <Logger name="org.nuiton.topia" level="warn" additivity="false">
    48 48 
           <AppenderRef ref="console"/>
    49 49 
         </Logger>
    50 
    -    <Logger name="com.opensymphony.xwork2.validator.validators" level="error" additivity="false">
    50 
    +    <Logger name="org.hibernate" level="warn" additivity="false">
    51 51 
           <AppenderRef ref="console"/>
    52 52 
         </Logger>
    53 
    -    <Logger name="org.nuiton.validator.xwork2.field" level="error" additivity="false">
    53 
    +    <Logger name="fr.ird.observe.services.service.referential.differential.DifferentialModel" level="warn" additivity="false">
    54 54 
           <AppenderRef ref="console"/>
    55 55 
         </Logger>
    56 
    +    <Logger name="fr.ird.observe" level="info" additivity="false">
    57 
    +      <AppenderRef ref="console"/>
    58 
    +    </Logger>
    59 
    +    <Root level="error">
    60 
    +      <AppenderRef ref="console"/>
    61 
    +    </Root>
    56 62 
       </Loggers>
    57 63 
     </Configuration>

  • validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/NonTargetCatchDto-update-error-validation.xml
    ... ... @@ -49,7 +49,7 @@
    49 49 
       <field name="meanWeight">
    50 50 
         <field-validator type="species_weightDto">
    51 51 
           <param name="ratio">1.0</param>
    52 
    -      <param name="expression">meanWeoight != null</param>
    52 
    +      <param name="expression">meanWeight != null</param>
    53 53 
           <message>observe.validation.species.weight.bound##${min}##${max}</message>
    54 54 
         </field-validator>
    55 55 
       </field>

  • validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/TargetLengthDto-update-warning-validation.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
         <field-validator type="species_lengthDto">
    28 28 
           <param name="ratio">1.0</param>
    29 29 
           <param name="expression">
    30 
    -        <![CDATA[ acquisitionMode == 0 || modeSaisie == 1 ]]>
    30 
    +        <![CDATA[ acquisitionMode == 0 || acquisitionMode == 1 ]]>
    31 31 
           </param>
    32 32 
           <message>observe.validation.species.length.bound##${min}##${max}</message>
    33 33 
         </field-validator>

    • —
    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.