Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
6587ac5e
by Tony CHEMIT at 2017-12-21T09:20:23+01:00
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:
| ... | ... | @@ -291,7 +291,7 @@ public class ValidateServiceTest extends ServiceTestSupport { |
| 291 | 291 |
|
| 292 | 292 |
assertValidateResult(result, TripSeineDto.class, 4);
|
| 293 | 293 |
assertValidateResult(result, RouteDto.class, 38); // 55
|
| 294 |
- assertValidateResult(result, ActivitySeineDto.class, 67); // 1516
|
|
| 294 |
+ assertValidateResult(result, ActivitySeineDto.class, 64); // 1516
|
|
| 295 | 295 |
assertValidateResult(result, TransmittingBuoyDto.class, 1);
|
| 296 | 296 |
assertValidateResult(result, SetSeineDto.class, 3);
|
| 297 | 297 |
assertValidateResult(result, NonTargetCatchDto.class, 2);
|
| ... | ... | @@ -8,12 +8,12 @@ |
| 8 | 8 |
* it under the terms of the GNU General Public License as
|
| 9 | 9 |
* published by the Free Software Foundation, either version 3 of the
|
| 10 | 10 |
* License, or (at your option) any later version.
|
| 11 |
- *
|
|
| 11 |
+ *
|
|
| 12 | 12 |
* This program is distributed in the hope that it will be useful,
|
| 13 | 13 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
| 14 | 14 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
| 15 | 15 |
* GNU General Public License for more details.
|
| 16 |
- *
|
|
| 16 |
+ *
|
|
| 17 | 17 |
* You should have received a copy of the GNU General Public
|
| 18 | 18 |
* License along with this program. If not, see
|
| 19 | 19 |
* <http://www.gnu.org/licenses/gpl-3.0.html>.
|
| ... | ... | @@ -72,8 +72,8 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup |
| 72 | 72 |
private Float ratio;
|
| 73 | 73 |
private String speciesField = "species";
|
| 74 | 74 |
|
| 75 |
- public void setRatio(float ratio) {
|
|
| 76 |
- this.ratio = ratio;
|
|
| 75 |
+ public void setRatio(String ratio) {
|
|
| 76 |
+ this.ratio = Float.valueOf(ratio);
|
|
| 77 | 77 |
}
|
| 78 | 78 |
|
| 79 | 79 |
public void setExpression(String expression) {
|
| ... | ... | @@ -84,8 +84,8 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup |
| 84 | 84 |
return enable;
|
| 85 | 85 |
}
|
| 86 | 86 |
|
| 87 |
- public void setEnable(boolean enable) {
|
|
| 88 |
- this.enable = enable;
|
|
| 87 |
+ public void setEnable(String enable) {
|
|
| 88 |
+ this.enable = Boolean.valueOf(enable);
|
|
| 89 | 89 |
}
|
| 90 | 90 |
|
| 91 | 91 |
@Override
|