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.
fix(#1675): Update granularity and offset validation checks
- Loading branch information
1 parent
4e83adb
commit 1facc82
Showing
13 changed files
with
707 additions
and
118 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
45 changes: 45 additions & 0 deletions
45
...ator/profile/validators/profile/constraints/capabilities/NumericGranularityValidator.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,45 @@ | ||
| /* | ||
| * 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.datahelix.generator.profile.validators.profile.constraints.capabilities; | ||
|
|
||
| import com.scottlogic.datahelix.generator.common.ValidationException; | ||
| import com.scottlogic.datahelix.generator.common.profile.NumericGranularity; | ||
| import com.scottlogic.datahelix.generator.common.validators.ValidationResult; | ||
| import com.scottlogic.datahelix.generator.common.validators.Validator; | ||
|
|
||
| public class NumericGranularityValidator implements Validator<Object> | ||
| { | ||
| private final String errorInfo; | ||
|
|
||
| public NumericGranularityValidator(String errorInfo) | ||
| { | ||
| this.errorInfo = errorInfo; | ||
| } | ||
|
|
||
| @Override | ||
| public final ValidationResult validate(Object granularity) | ||
| { | ||
| try | ||
| { | ||
| NumericGranularity.create(granularity); | ||
| return ValidationResult.success(); | ||
| } catch (ValidationException e) | ||
| { | ||
| return ValidationResult.failure(String.format("%s%s", e.getMessage(), errorInfo)); | ||
| } | ||
| } | ||
| } |
55 changes: 55 additions & 0 deletions
55
...tor/profile/validators/profile/constraints/relations/EqualToFieldConstraintValidator.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,55 @@ | ||
| /* | ||
| * 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.datahelix.generator.profile.validators.profile.constraints.relations; | ||
|
|
||
| import com.scottlogic.datahelix.generator.common.profile.FieldType; | ||
| import com.scottlogic.datahelix.generator.common.validators.ValidationResult; | ||
| import com.scottlogic.datahelix.generator.profile.dtos.FieldDTO; | ||
| import com.scottlogic.datahelix.generator.profile.dtos.constraints.relations.EqualToFieldConstraintDTO; | ||
| import com.scottlogic.datahelix.generator.profile.validators.profile.FieldValidator; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class EqualToFieldConstraintValidator extends RelationalConstraintValidator<EqualToFieldConstraintDTO> | ||
| { | ||
|
|
||
| public EqualToFieldConstraintValidator(List<FieldDTO> fields) | ||
| { | ||
| super(fields); | ||
| } | ||
|
|
||
| @Override | ||
| public ValidationResult validate(EqualToFieldConstraintDTO dto) | ||
| { | ||
| ValidationResult fieldsAndOffsetValid = ValidationResult.combine( | ||
| fieldMustBeValid(dto, dto.field, FIELD_DESCRIPTION), | ||
| fieldMustBeValid(dto, dto.getOtherField(), RELATED_FIELD_DESCRIPTION), | ||
| offsetMustBeValid(dto) | ||
| ); | ||
| return fieldsAndOffsetValid.isSuccess ? fieldAndOtherFieldMustHaveType(dto) : fieldsAndOffsetValid; | ||
| } | ||
|
|
||
| private ValidationResult fieldAndOtherFieldMustHaveType(EqualToFieldConstraintDTO dto) | ||
| { | ||
| FieldType fieldType = FieldValidator.getSpecificFieldType(getField(dto.field)).getFieldType(); | ||
| FieldType otherFieldType = FieldValidator.getSpecificFieldType(getField(dto.getOtherField())).getFieldType(); | ||
|
|
||
| return fieldType == otherFieldType | ||
| ? ValidationResult.success() | ||
| : ValidationResult.failure(String.format("Field type %s doesn't match related field type %s%s", ValidationResult.quote(dto.field), ValidationResult.quote(dto.getOtherField()), getErrorInfo(dto))); | ||
| } | ||
| } |
58 changes: 58 additions & 0 deletions
58
...rofile/validators/profile/constraints/relations/NumericRelationalConstraintValidator.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,58 @@ | ||
| /* | ||
| * 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.datahelix.generator.profile.validators.profile.constraints.relations; | ||
|
|
||
| import com.scottlogic.datahelix.generator.common.profile.FieldType; | ||
| import com.scottlogic.datahelix.generator.common.validators.ValidationResult; | ||
| import com.scottlogic.datahelix.generator.profile.dtos.FieldDTO; | ||
| import com.scottlogic.datahelix.generator.profile.dtos.constraints.relations.RelationalConstraintDTO; | ||
| import com.scottlogic.datahelix.generator.profile.validators.profile.FieldValidator; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| import static com.scottlogic.datahelix.generator.common.validators.ValidationResult.quote; | ||
|
|
||
| public class NumericRelationalConstraintValidator<T extends RelationalConstraintDTO> extends RelationalConstraintValidator<T> | ||
| { | ||
| public NumericRelationalConstraintValidator(List<FieldDTO> fields) | ||
| { | ||
| super(fields); | ||
| } | ||
|
|
||
| @Override | ||
| public ValidationResult validate(T dto) | ||
| { | ||
| return ValidationResult.combine( | ||
| fieldMustBeValid(dto, dto.field, FIELD_DESCRIPTION), | ||
| fieldMustBeValid(dto, dto.getOtherField(), RELATED_FIELD_DESCRIPTION), | ||
| fieldTypeMustBeNumeric(dto, dto.field, FIELD_DESCRIPTION), | ||
| fieldTypeMustBeNumeric(dto, dto.getOtherField(), RELATED_FIELD_DESCRIPTION), | ||
| offsetMustBeValid(dto) | ||
| ); | ||
| } | ||
|
|
||
| private ValidationResult fieldTypeMustBeNumeric(T dto, String fieldName, String fieldDescription) | ||
| { | ||
| Optional<FieldType> fieldType = findField(fieldName) | ||
| .map(f -> FieldValidator.getSpecificFieldType(f).getFieldType()); | ||
|
|
||
| return !fieldType.isPresent() || fieldType.get() == FieldType.NUMERIC | ||
| ? ValidationResult.success() | ||
| : ValidationResult.failure(String.format("%s must be numeric however it has type %s%s", fieldDescription, quote(fieldType.get()), getErrorInfo(dto))); | ||
| } | ||
| } |
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
Oops, something went wrong.