This repository has been archived by the owner on Apr 14, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1528 from cdowding-sl/fix/1361
Implemented string length validation for textual constraints
- Loading branch information
Showing
6 changed files
with
148 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
...ogic/deg/profile/validators/profile/constraints/atomic/LongerThanConstraintValidator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * Copyright 2019 Scott Logic Ltd | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.scottlogic.deg.profile.validators.profile.constraints.atomic; | ||
|
|
||
| import com.scottlogic.deg.common.profile.FieldType; | ||
| import com.scottlogic.deg.common.util.Defaults; | ||
| import com.scottlogic.deg.common.validators.ValidationResult; | ||
| import com.scottlogic.deg.profile.dtos.FieldDTO; | ||
| import com.scottlogic.deg.profile.dtos.constraints.atomic.integer.LongerThanConstraintDTO; | ||
| import com.scottlogic.deg.profile.dtos.constraints.atomic.integer.StringLengthConstraintDTO; | ||
|
|
||
| import java.math.BigDecimal; | ||
| import java.util.List; | ||
|
|
||
| public class LongerThanConstraintValidator extends AtomicConstraintValidator<LongerThanConstraintDTO> | ||
| { | ||
| private final FieldType expectedFieldType; | ||
|
|
||
| public LongerThanConstraintValidator(String rule, List<FieldDTO> fields, FieldType expectedFieldType) | ||
| { | ||
| super(rule, fields); | ||
| this.expectedFieldType = expectedFieldType; | ||
| } | ||
|
|
||
| @Override | ||
| public final ValidationResult validate(LongerThanConstraintDTO dto) | ||
| { | ||
| ValidationResult fieldMustBeValid = fieldMustBeValid(dto); | ||
| if(!fieldMustBeValid.isSuccess) return fieldMustBeValid; | ||
|
|
||
| ValidationResult stringLengthMustBeValid = stringLengthMustBeValid(dto); | ||
| if(!stringLengthMustBeValid.isSuccess) return stringLengthMustBeValid; | ||
|
|
||
| return fieldTypeMustMatchValueType(dto, expectedFieldType); | ||
| } | ||
|
|
||
| private ValidationResult stringLengthMustBeValid(StringLengthConstraintDTO dto) | ||
| { | ||
| BigDecimal integer = BigDecimal.valueOf(dto.stringLength()); | ||
| BigDecimal max = BigDecimal.valueOf(Defaults.MAX_STRING_LENGTH); | ||
| return integer.compareTo(max) <= 0 | ||
| ? ValidationResult.success() | ||
| : ValidationResult.failure(String.format("String length must have a value <= %s, currently is %s" | ||
| , max.toPlainString(), integer.toPlainString())); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
...gic/deg/profile/validators/profile/constraints/atomic/ShorterThanConstraintValidator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Copyright 2019 Scott Logic Ltd | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.scottlogic.deg.profile.validators.profile.constraints.atomic; | ||
|
|
||
| import com.scottlogic.deg.common.profile.FieldType; | ||
| import com.scottlogic.deg.common.validators.ValidationResult; | ||
| import com.scottlogic.deg.profile.dtos.FieldDTO; | ||
| import com.scottlogic.deg.profile.dtos.constraints.atomic.integer.ShorterThanConstraintDTO; | ||
| import com.scottlogic.deg.profile.dtos.constraints.atomic.integer.StringLengthConstraintDTO; | ||
|
|
||
| import java.math.BigDecimal; | ||
| import java.util.List; | ||
|
|
||
| public class ShorterThanConstraintValidator extends AtomicConstraintValidator<ShorterThanConstraintDTO> | ||
| { | ||
| private final FieldType expectedFieldType; | ||
|
|
||
| public ShorterThanConstraintValidator(String rule, List<FieldDTO> fields, FieldType expectedFieldType) | ||
| { | ||
| super(rule, fields); | ||
| this.expectedFieldType = expectedFieldType; | ||
| } | ||
|
|
||
| @Override | ||
| public final ValidationResult validate(ShorterThanConstraintDTO dto) | ||
| { | ||
| ValidationResult fieldMustBeValid = fieldMustBeValid(dto); | ||
| if(!fieldMustBeValid.isSuccess) return fieldMustBeValid; | ||
|
|
||
| ValidationResult stringLengthMustBeValid = stringLengthMustBeValid(dto); | ||
| if(!stringLengthMustBeValid.isSuccess) return stringLengthMustBeValid; | ||
|
|
||
| return fieldTypeMustMatchValueType(dto, expectedFieldType); | ||
| } | ||
|
|
||
| private ValidationResult stringLengthMustBeValid(StringLengthConstraintDTO dto) | ||
| { | ||
| BigDecimal integer = BigDecimal.valueOf(dto.stringLength()); | ||
| BigDecimal min = BigDecimal.ZERO; | ||
| return integer.compareTo(min) >= 0 | ||
| ? ValidationResult.success() | ||
| : ValidationResult.failure(String.format("String length must have a value >= %s, currently is %s" | ||
| , min.toPlainString(), integer.toPlainString())); | ||
| } | ||
| } |