Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f9b772d9 by tchemit at 2019-01-16T15:51:24Z remove validation from dto module - - - - - 21 changed files: - dto/pom.xml - dto/src/main/i18n/getters/java.getter - services/pom.xml - services/src/main/i18n/getters/java.getter - dto/src/main/java/fr/ird/observe/validation/SeineBycatchObservedSystemConfig.java → services/src/main/java/fr/ird/observe/validation/SeineBycatchObservedSystemConfig.java - dto/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ActivitySeineObservedSystemValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivitySeineObservedSystemValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/NonTargetCatchObservedSystemValidator.java → services/src/main/java/fr/ird/observe/validation/validators/NonTargetCatchObservedSystemValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/ObserveLengthFormulaCollectionUniqueKeyDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ObserveLengthFormulaCollectionUniqueKeyDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/OpenableDtoFieldValidator.java → services/src/main/java/fr/ird/observe/validation/validators/OpenableDtoFieldValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueNumberDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueNumberDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueNumberDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueNumberDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/SpeciesLengthFieldDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SpeciesLengthFieldDtoValidator.java - dto/src/main/java/fr/ird/observe/validation/validators/SpeciesWeightFieldDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SpeciesWeightFieldDtoValidator.java - validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== dto/pom.xml ===================================== @@ -64,10 +64,6 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-decorator</artifactId> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - </dependency> <dependency> <groupId>io.ultreia.java4all.http</groupId> @@ -83,12 +79,6 @@ <artifactId>java-bean</artifactId> </dependency> - <!-- XWork --> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> - <!-- commons dependencies --> <dependency> <groupId>org.apache.logging.log4j</groupId> ===================================== dto/src/main/i18n/getters/java.getter ===================================== @@ -48,5 +48,3 @@ observe.common.nocode observe.common.none observe.common.program observe.common.settingIdentifier -observe.validation.activity.speed.bound -observe.validation.activity.speed.bound.inter ===================================== services/pom.xml ===================================== @@ -68,6 +68,11 @@ </dependency> <!-- nuiton dependencies --> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-version</artifactId> ===================================== services/src/main/i18n/getters/java.getter ===================================== @@ -4,4 +4,6 @@ observe.common.ActivityLonglinePairingResultItemDto.computedTime observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue observe.common.ActivityLonglinePairingResultItemDto.observationActivity observe.common.ActivityLonglinePairingResultItemDto.type +observe.validation.activity.speed.bound +observe.validation.activity.speed.bound.inter observe.validation.trip.vessel.overlap ===================================== dto/src/main/java/fr/ird/observe/validation/SeineBycatchObservedSystemConfig.java → services/src/main/java/fr/ird/observe/validation/SeineBycatchObservedSystemConfig.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/ActivitySeineObservedSystemValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivitySeineObservedSystemValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/NonTargetCatchObservedSystemValidator.java → services/src/main/java/fr/ird/observe/validation/validators/NonTargetCatchObservedSystemValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/ObserveLengthFormulaCollectionUniqueKeyDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ObserveLengthFormulaCollectionUniqueKeyDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/OpenableDtoFieldValidator.java → services/src/main/java/fr/ird/observe/validation/validators/OpenableDtoFieldValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueNumberDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueNumberDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueNumberDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueNumberDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/SpeciesLengthFieldDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SpeciesLengthFieldDtoValidator.java ===================================== ===================================== dto/src/main/java/fr/ird/observe/validation/validators/SpeciesWeightFieldDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SpeciesWeightFieldDtoValidator.java ===================================== ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -21,7 +21,6 @@ observe.validation.lengthWeightParameter.invalid.weightLengthFormula observe.validation.nonTargetCatch.missing.observedSystem observe.validation.nonTargetCatch.required.weightOrNombreEstime observe.validation.nonTargetCatch.required.weightOrTailleMoyen -observe.validation.nonTargetCatch.uniqueKey observe.validation.nonTargetSample.required.weight.or.taille observe.validation.objectMaterial.invalid.validation observe.validation.objectObservedSpecies.positive.count View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f9b772d932cfec57877d095245ed... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f9b772d932cfec57877d095245ed... You're receiving this email because of your account on gitlab.com.