Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6587ac5e by Tony CHEMIT at 2017-12-21T09:20:23+01:00 fix validation - - - - - 2 changed files: - services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java - validation/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java Changes: ===================================== services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java @@ -291,7 +291,7 @@ public class ValidateServiceTest extends ServiceTestSupport { assertValidateResult(result, TripSeineDto.class, 4); assertValidateResult(result, RouteDto.class, 38); // 55 - assertValidateResult(result, ActivitySeineDto.class, 67); // 1516 + assertValidateResult(result, ActivitySeineDto.class, 64); // 1516 assertValidateResult(result, TransmittingBuoyDto.class, 1); assertValidateResult(result, SetSeineDto.class, 3); assertValidateResult(result, NonTargetCatchDto.class, 2); ===================================== validation/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java ===================================== --- a/validation/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java +++ b/validation/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java @@ -8,12 +8,12 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -72,8 +72,8 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup private Float ratio; private String speciesField = "species"; - public void setRatio(float ratio) { - this.ratio = ratio; + public void setRatio(String ratio) { + this.ratio = Float.valueOf(ratio); } public void setExpression(String expression) { @@ -84,8 +84,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.valueOf(enable); } @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6587ac5e3549fd2254b709f69896... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6587ac5e3549fd2254b709f69896... You're receiving this email because of your account on gitlab.com.