-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#266 - Change validation information
- add mutable criterion and structured query classes that can be easily annotated during validation. Provide converters to convert immutable to mutable and vice versa - remove validatedstructuredquery - add validation issues - remove invalidCriteria from entities
- Loading branch information
1 parent
ca4b4e2
commit 9368876
Showing
19 changed files
with
405 additions
and
98 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
36 changes: 36 additions & 0 deletions
36
src/main/java/de/numcodex/feasibility_gui_backend/common/api/MutableCriterion.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,36 @@ | ||
| package de.numcodex.feasibility_gui_backend.common.api; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.annotation.JsonInclude.Include; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import de.numcodex.feasibility_gui_backend.query.api.AttributeFilter; | ||
| import de.numcodex.feasibility_gui_backend.query.api.TimeRestriction; | ||
| import de.numcodex.feasibility_gui_backend.query.api.ValueFilter; | ||
| import de.numcodex.feasibility_gui_backend.query.api.status.ValidationIssues; | ||
| import lombok.Builder; | ||
| import lombok.Data; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @JsonInclude(Include.NON_NULL) | ||
| @Builder | ||
| @Data | ||
| public class MutableCriterion { | ||
| @JsonProperty("context") TermCode context; | ||
| @JsonProperty("termCodes") List<TermCode> termCodes; | ||
| @JsonProperty("attributeFilters") List<AttributeFilter> attributeFilters; | ||
| @JsonProperty("valueFilter") ValueFilter valueFilter; | ||
| @JsonProperty("timeRestriction") TimeRestriction timeRestriction; | ||
| @JsonProperty("issues") ValidationIssues validationIssues; | ||
|
|
||
| public static MutableCriterion createMutableCriterion (Criterion criterion) { | ||
| return MutableCriterion.builder() | ||
| .termCodes(criterion.termCodes()) | ||
| .context(criterion.context()) | ||
| .attributeFilters(criterion.attributeFilters()) | ||
| .valueFilter(criterion.valueFilter()) | ||
| .timeRestriction(criterion.timeRestriction()) | ||
| .validationIssues(criterion.validationIssues()) | ||
| .build(); | ||
| } | ||
| } |
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
54 changes: 54 additions & 0 deletions
54
src/main/java/de/numcodex/feasibility_gui_backend/query/api/MutableStructuredQuery.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,54 @@ | ||
| package de.numcodex.feasibility_gui_backend.query.api; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.annotation.JsonInclude.Include; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import de.numcodex.feasibility_gui_backend.common.api.Criterion; | ||
| import de.numcodex.feasibility_gui_backend.common.api.MutableCriterion; | ||
| import de.numcodex.feasibility_gui_backend.query.api.validation.StructuredQueryValidation; | ||
| import lombok.Builder; | ||
| import lombok.Data; | ||
|
|
||
| import java.net.URI; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| @JsonInclude(Include.NON_EMPTY) | ||
| @Builder | ||
| @Data | ||
| public class MutableStructuredQuery { | ||
| @JsonProperty URI version; | ||
| @JsonProperty("inclusionCriteria") List<List<MutableCriterion>> inclusionCriteria; | ||
| @JsonProperty("exclusionCriteria") List<List<MutableCriterion>> exclusionCriteria; | ||
| @JsonProperty("display") String display; | ||
|
|
||
| public static MutableStructuredQuery createMutableStructuredQuery(StructuredQuery structuredQuery) { | ||
| List<List<MutableCriterion>> mutableInclusionCriteria = new ArrayList<>(); | ||
| if (structuredQuery.inclusionCriteria() != null) { | ||
| for (List<Criterion> outerList : structuredQuery.inclusionCriteria()) { | ||
| List<MutableCriterion> innerList = new ArrayList<>(); | ||
| for (Criterion criterion : outerList) { | ||
| innerList.add(MutableCriterion.createMutableCriterion(criterion)); | ||
| } | ||
| mutableInclusionCriteria.add(innerList); | ||
| } | ||
| } | ||
|
|
||
| List<List<MutableCriterion>> mutableExclusionCriteria = new ArrayList<>(); | ||
| if (structuredQuery.exclusionCriteria() != null) { | ||
| for (List<Criterion> outerList : structuredQuery.exclusionCriteria()) { | ||
| List<MutableCriterion> innerList = new ArrayList<>(); | ||
| for (Criterion criterion : outerList) { | ||
| innerList.add(MutableCriterion.createMutableCriterion(criterion)); | ||
| } | ||
| mutableExclusionCriteria.add(innerList); | ||
| } | ||
| } | ||
| return MutableStructuredQuery.builder() | ||
| .version(structuredQuery.version()) | ||
| .inclusionCriteria(mutableInclusionCriteria) | ||
| .exclusionCriteria(mutableExclusionCriteria) | ||
| .display(structuredQuery.display()) | ||
| .build(); | ||
| } | ||
| } |
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
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
15 changes: 0 additions & 15 deletions
15
src/main/java/de/numcodex/feasibility_gui_backend/query/api/ValidatedStructuredQuery.java
This file was deleted.
Oops, something went wrong.
51 changes: 51 additions & 0 deletions
51
src/main/java/de/numcodex/feasibility_gui_backend/query/api/status/ValidationIssue.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,51 @@ | ||
| package de.numcodex.feasibility_gui_backend.query.api.status; | ||
|
|
||
| import com.fasterxml.jackson.databind.annotation.JsonSerialize; | ||
| import jakarta.annotation.Nullable; | ||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
| @Slf4j | ||
| @JsonSerialize(using = ValidationIssueSerializer.class) | ||
| public enum ValidationIssue { | ||
| TERMCODE_CONTEXT_COMBINATION_INVALID(20001, "The combination of context and termcode(s) is not found."); | ||
|
|
||
| private static final ValidationIssue[] VALUES; | ||
|
|
||
| static { | ||
| VALUES = values(); | ||
| } | ||
|
|
||
| private final int code; | ||
| private final String detail; | ||
|
|
||
| ValidationIssue(int code, String detail) { | ||
| this.code = code; | ||
| this.detail = detail; | ||
| } | ||
|
|
||
| public int code() { | ||
| return this.code; | ||
| } | ||
|
|
||
| public String detail() { | ||
| return this.detail; | ||
| } | ||
|
|
||
| public static ValidationIssue valueOf(int validationIssueCode) { | ||
| ValidationIssue validationIssue = resolve(validationIssueCode); | ||
| if (validationIssue == null) { | ||
| throw new IllegalArgumentException("No matching Validation issue for code " + validationIssueCode); | ||
| } | ||
| return validationIssue; | ||
| } | ||
|
|
||
| @Nullable | ||
| public static ValidationIssue resolve(int validationIssueCode) { | ||
| for (ValidationIssue validationIssue : VALUES) { | ||
| if (validationIssue.code == validationIssueCode) { | ||
| return validationIssue; | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
| } |
Oops, something went wrong.