Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 901e37d3 by Tony Chemit at 2022-05-02T00:56:31+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.13' with non-snapshot versions[skip ci] - - - - - 17e92d53 by Tony Chemit at 2022-05-02T01:04:41+02:00 Problème de quadrant - See #2300 - - - - - 90afce3e by Tony Chemit at 2022-05-02T01:28:10+02:00 [jgitflow-maven-plugin]merging 'release/7.6.13' into 'master-7.x' - - - - - a586bdca by Tony Chemit at 2022-05-02T01:28:12+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - c609ca83 by Tony Chemit at 2022-05-02T01:28:13+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 9c85af5e by Tony Chemit at 2022-05-02T01:28:13+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 1 changed file: - common-validation/src/main/java/fr/ird/observe/validation/validators/QuadrantFieldDtoValidator.java Changes: ===================================== common-validation/src/main/java/fr/ird/observe/validation/validators/QuadrantFieldDtoValidator.java ===================================== @@ -49,7 +49,7 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport { throw new ValidationException("No parameter 'fieldName' filled"); } - ReferentialDtoReference ocean = (ReferentialDtoReference) getFieldValue(this.ocean, object); + ReferentialDtoReference<?,?> ocean = (ReferentialDtoReference<?, ?>) getFieldValue(this.ocean, object); if (ocean == null) { throw new ValidationException("could not find ocean named: " + this.ocean); } @@ -59,13 +59,13 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport { return; } - int code = ocean.get(ReferentialDtoReference.PROPERTY_CODE); + String code = ocean.get(ReferentialDtoReference.PROPERTY_CODE); boolean valid; switch (code) { - case 1: // Atlantic + case "1": // Atlantic valid= quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4; break; - case 2: // Indian + case "2": // Indian valid = quadrant == 1 || quadrant == 2; break; default: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/aa9f14e9dbb2c4b28df14af31... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/aa9f14e9dbb2c4b28df14af31... You're receiving this email because of your account on gitlab.com.