[Observe-commits] [Git][ultreiaio/ird-observe][develop] 3 commits: Deux coquilles dans les validations - Closes #1572 (report v8)

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 98215722 by Tony Chemit at 2020-07-05T14:00:13+02:00 Deux coquilles dans les validations - Closes #1572 (report v8) - - - - - b187a13b by Tony Chemit at 2020-07-05T14:04:35+02:00 Problème de traduction sur les validations taille/poids des espèces - Closes #1571 (report v8) - - - - - ed6ffb07 by Tony Chemit at 2020-07-05T14:07:23+02:00 Amélioration des logs - Closes #1574 (report v8) - - - - - 9 changed files: - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - server-configuration/src/main/resources/log4j2.xml - server-configuration/src/main/resources/observeweb-log4j2.xml - services-validation/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java - test/src/main/resources/fixtures/validate-service-seine-trips.properties - test/src/main/resources/log4j2.xml - validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/NonTargetCatchDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/TargetLengthDto-update-warning-validation.xml Changes: ===================================== client-configuration/src/main/resources/log4j2.xml ===================================== @@ -18,8 +18,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> - -<Configuration status="error"> +<Configuration strict="true" status="error"> <Appenders> <Console name="console" target="SYSTEM_OUT"> <PatternLayout pattern="%-5p %d{ISO8601} [%t] %40C{1} :%4L - %m%n"/> @@ -35,53 +34,49 @@ </RollingFile> </Appenders> <Loggers> - <Root level="warn"> - <AppenderRef ref="console"/> - <AppenderRef ref="File"/> - </Root> - <Logger name="fr.ird.observe" level="info" additivity="false"> + <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton" level="warn" additivity="false"> + <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton.topia" level="info" additivity="false"> + <Logger name="org.nuiton.validator.xwork2.XWork2ScopeValidator" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false"> + <Logger name="com.opensymphony.xwork2.validator.validators" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="io.ultreia" level="info" additivity="false"> + <Logger name="org.nuiton.validator.xwork2.field" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.hibernate" level="warn" additivity="false"> + <Logger name="fr.ird.observe.spi.DtoModelHelper" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false"> + <Logger name="org.nuiton.topia" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false"> + <Logger name="org.hibernate" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false"> + <Logger name="fr.ird.observe.services.service.referential.differential.DifferentialModel" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="com.opensymphony.xwork2.validator.validators" level="error" additivity="false"> + <Logger name="fr.ird.observe" level="info" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton.validator.xwork2.field" level="error" additivity="false"> + <Root level="error"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> - </Logger> + </Root> </Loggers> -</Configuration> +</Configuration> \ No newline at end of file ===================================== client-configuration/src/main/resources/observe-log4j2.xml ===================================== @@ -19,13 +19,13 @@ #L% --> -<Configuration status="error"> +<Configuration strict="true" status="error"> <Appenders> <Console name="console" target="SYSTEM_OUT"> <PatternLayout pattern="%-5p %d{ISO8601} [%t] %40C{1} :%4L - %m%n"/> </Console> - <RollingFile name="File" fileName="${log.directory}/observe-${application.version}.log" - filePattern="${log.directory}/observe-${application.version}-%d{MM-dd-yyyy}-%i.log.gz"> + <RollingFile name="File" fileName="${data.directory}/log/observe-${application.version}.log" + filePattern="${data.directory}/log/observe-${application.version}-%d{MM-dd-yyyy}-%i.log.gz"> <PatternLayout pattern="%-5p %d{ISO8601} [%t] %40C{1} :%4L - %m%n"/> <Policies> <TimeBasedTriggeringPolicy/> @@ -35,31 +35,31 @@ </RollingFile> </Appenders> <Loggers> - <Logger name="fr.ird.observe" level="info" additivity="false"> + <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton" level="warn" additivity="false"> + <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton.i18n.editor" level="info" additivity="false"> + <Logger name="org.nuiton.validator.xwork2.XWork2ScopeValidator" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton.topia" level="info" additivity="false"> + <Logger name="com.opensymphony.xwork2.validator.validators" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false"> + <Logger name="org.nuiton.validator.xwork2.field" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false"> + <Logger name="fr.ird.observe.spi.DtoModelHelper" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="io.ultreia" level="info" additivity="false"> + <Logger name="org.nuiton.topia" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> @@ -67,29 +67,17 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false"> - <AppenderRef ref="console"/> - <AppenderRef ref="File"/> - </Logger> - <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false"> - <AppenderRef ref="console"/> - <AppenderRef ref="File"/> - </Logger> - <Logger name="com.opensymphony.xwork2.validator.validators" level="error" additivity="false"> - <AppenderRef ref="console"/> - <AppenderRef ref="File"/> - </Logger> - <Logger name="org.nuiton.validator.xwork2.field" level="error" additivity="false"> + <Logger name="fr.ird.observe.services.service.referential.differential.DifferentialModel" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false"> + <Logger name="fr.ird.observe" level="info" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="io.ultreia.java4all.jaxx.widgets.combobox" level="info" additivity="false"> + <Root level="error"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> - </Logger> + </Root> </Loggers> </Configuration> ===================================== server-configuration/src/main/resources/log4j2.xml ===================================== @@ -18,49 +18,45 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> - -<Configuration status="error"> +<Configuration strict="true" status="error"> <Appenders> <Console name="console" target="SYSTEM_OUT"> <PatternLayout pattern="%-5p %d{ISO8601} [%t] %40C{1} :%4L - %m%n"/> </Console> </Appenders> <Loggers> - <Logger name="fr.ird.observe" level="info" additivity="false"> + <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="org.nuiton" level="warn" additivity="false"> + <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="org.nuiton.topia" level="info" additivity="false"> + <Logger name="org.nuiton.validator.xwork2.XWork2ScopeValidator" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false"> + <Logger name="com.opensymphony.xwork2.validator.validators" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false"> + <Logger name="org.nuiton.validator.xwork2.field" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="org.debux" level="info" additivity="false"> + <Logger name="fr.ird.observe.spi.DtoModelHelper" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="io.ultreia" level="info" additivity="false"> + <Logger name="org.nuiton.topia" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="org.hibernate" level="info" additivity="false"> + <Logger name="org.hibernate" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false"> + <Logger name="fr.ird.observe.services.service.referential.differential.DifferentialModel" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false"> - <AppenderRef ref="console"/> - </Logger> - <Logger name="com.opensymphony.xwork2.validator.validators" level="error" additivity="false"> + <Logger name="fr.ird.observe" level="info" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="org.nuiton.validator.xwork2.field" level="error" additivity="false"> + <Root level="error"> <AppenderRef ref="console"/> - </Logger> + </Root> </Loggers> -</Configuration> +</Configuration> \ No newline at end of file ===================================== server-configuration/src/main/resources/observeweb-log4j2.xml ===================================== @@ -19,8 +19,7 @@ #L% --> - -<Configuration status="error"> +<Configuration strict="true" status="error"> <Appenders> <Console name="console" target="SYSTEM_OUT"> <PatternLayout pattern="%-5p %d{ISO8601} [%t] %40C{1} :%4L - %m%n"/> @@ -36,31 +35,31 @@ </RollingFile> </Appenders> <Loggers> - <Logger name="fr.ird.observe" level="info" additivity="false"> + <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton" level="warn" additivity="false"> + <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton.topia" level="info" additivity="false"> + <Logger name="org.nuiton.validator.xwork2.XWork2ScopeValidator" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false"> + <Logger name="com.opensymphony.xwork2.validator.validators" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false"> + <Logger name="org.nuiton.validator.xwork2.field" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.debux" level="info" additivity="false"> + <Logger name="fr.ird.observe.spi.DtoModelHelper" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="io.ultreia" level="info" additivity="false"> + <Logger name="org.nuiton.topia" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> @@ -68,21 +67,17 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false"> + <Logger name="fr.ird.observe.services.service.referential.differential.DifferentialModel" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false"> - <AppenderRef ref="console"/> - <AppenderRef ref="File"/> - </Logger> - <Logger name="com.opensymphony.xwork2.validator.validators" level="error" additivity="false"> + <Logger name="fr.ird.observe" level="info" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton.validator.xwork2.field" level="error" additivity="false"> + <Root level="error"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> - </Logger> + </Root> </Loggers> </Configuration> ===================================== services-validation/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java ===================================== @@ -26,10 +26,13 @@ import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; import fr.ird.observe.dto.referential.common.SpeciesDto; import fr.ird.observe.dto.referential.common.SpeciesReference; +import io.ultreia.java4all.lang.Numbers; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.Objects; + /** * <!-- START SNIPPET: javadoc --> * Ce validateur verifie qu'une espece respece bien les tailles ou @@ -69,7 +72,7 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup * @since 2.3 */ protected String expression; - private boolean enable; + private Boolean enable; /** le ratio a appliquer sur les bornes définies dans le référentiel */ private Float ratio; private String speciesField = "species"; @@ -84,8 +87,8 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup this.speciesField = speciesField; } - public void setRatio(float ratio) { - this.ratio = ratio; + public void setRatio(String ratio) { + this.ratio = Float.parseFloat(Objects.requireNonNull(ratio)); } public void setExpression(String expression) { @@ -96,8 +99,8 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup return enable; } - public void setEnable(boolean enable) { - this.enable = enable; + public void setEnable(String enable) { + this.enable = Boolean.parseBoolean(Objects.requireNonNull(enable)); } protected abstract Float getBoundMin(SpeciesDto referentiel); @@ -111,9 +114,9 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup private boolean shouldValidate(Object object) throws ValidationException { Boolean enable = (Boolean) getFieldValue("validationLengthWeightEnable", object); - if (enable != null) { + if (enable != null && this.enable != null) { - if (this.enable != enable) { + if (!Objects.equals(this.enable, enable)) { if (log.isDebugEnabled()) { log.debug("Skip speed validation"); @@ -220,11 +223,11 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup } public Float getMin() { - return boundWithRatio.getMin(); + return Numbers.roundThreeDigits(boundWithRatio.getMin()); } public Float getMax() { - return boundWithRatio.getMax(); + return Numbers.roundThreeDigits(boundWithRatio.getMax()); } private Bound getBound(SpeciesDto species) { ===================================== test/src/main/resources/fixtures/validate-service-seine-trips.properties ===================================== @@ -24,7 +24,7 @@ RouteDto=3 ActivityDto=11 TransmittingBuoyDto=2 SetDto=3 -NonTargetCatchDto=3 +NonTargetCatchDto=4 NonTargetLengthDto=3 TargetLengthDto=1 FloatingObjectDto=1 ===================================== test/src/main/resources/log4j2.xml ===================================== @@ -19,39 +19,45 @@ #L% --> -<Configuration status="error"> +<Configuration strict="true" status="warn"> <Appenders> <Console name="console" target="SYSTEM_OUT"> <PatternLayout pattern="%-5p %d{ISO8601} [%t] %40C{1} :%4L - %m%n"/> </Console> </Appenders> <Loggers> - <Logger name="io.ultreia.java4all.application.context" level="warning" additivity="false"> + <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="io.ultreia.java4all.application" level="info" additivity="false"> + <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="fr.ird.observe" level="info" additivity="false"> + <Logger name="org.nuiton.validator.xwork2.XWork2ScopeValidator" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="org.nuiton.topia" level="info" additivity="false"> + <Logger name="com.opensymphony.xwork2.validator.validators" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="org.hibernate" level="info" additivity="false"> + <Logger name="org.nuiton.validator.xwork2.field" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="org.hibernate.orm.deprecation" level="error" additivity="false"> + <Logger name="fr.ird.observe.spi.DtoModelHelper" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="com.zaxxer.hikari.HikariDataSource" level="error" additivity="false"> + <Logger name="org.nuiton.topia" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="com.opensymphony.xwork2.validator.validators" level="error" additivity="false"> + <Logger name="org.hibernate" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> - <Logger name="org.nuiton.validator.xwork2.field" level="error" additivity="false"> + <Logger name="fr.ird.observe.services.service.referential.differential.DifferentialModel" level="warn" additivity="false"> <AppenderRef ref="console"/> </Logger> + <Logger name="fr.ird.observe" level="info" additivity="false"> + <AppenderRef ref="console"/> + </Logger> + <Root level="error"> + <AppenderRef ref="console"/> + </Root> </Loggers> </Configuration> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/NonTargetCatchDto-update-error-validation.xml ===================================== @@ -49,7 +49,7 @@ <field name="meanWeight"> <field-validator type="species_weightDto"> <param name="ratio">1.0</param> - <param name="expression">meanWeoight != null</param> + <param name="expression">meanWeight != null</param> <message>observe.validation.species.weight.bound##${min}##${max}</message> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/TargetLengthDto-update-warning-validation.xml ===================================== @@ -27,7 +27,7 @@ <field-validator type="species_lengthDto"> <param name="ratio">1.0</param> <param name="expression"> - <![CDATA[ acquisitionMode == 0 || modeSaisie == 1 ]]> + <![CDATA[ acquisitionMode == 0 || acquisitionMode == 1 ]]> </param> <message>observe.validation.species.length.bound##${min}##${max}</message> </field-validator> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/feeb5bf51f33af0f4a3479bf2... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/feeb5bf51f33af0f4a3479bf2... You're receiving this email because of your account on gitlab.com.