honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce nesting

This commit is contained in:
dotasek 2024-12-02 19:31:13 -05:00
parent 7cbef50f6b
commit cddc60e352
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java
View File

@ -1716,19 +1716,20 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
// } // }
private boolean calculateSeverityForIssuesAndUpdateErrors(List<ValidationMessage> errors, ValidationResult validationResult, Element element, String path, boolean ignoreCantInfer, String vsurl, BindingStrength bindingStrength) { private boolean calculateSeverityForIssuesAndUpdateErrors(List<ValidationMessage> errors, ValidationResult validationResult, Element element, String path, boolean ignoreCantInfer, String vsurl, BindingStrength bindingStrength) {
if (validationResult == null) {
return true;
}
boolean noErrorsFound = true; boolean noErrorsFound = true;
if (validationResult != null) { for (OperationOutcomeIssueComponent issue : validationResult.getIssues()) {
for (OperationOutcomeIssueComponent issue : validationResult.getIssues()) { if (!isIgnoredTxIssueType(issue, ignoreCantInfer)) {
if (!isIgnoredTxIssueType(issue, ignoreCantInfer)) { OperationOutcomeIssueComponent issueWithCalculatedSeverity = getTxIssueWithCalculatedSeverity(issue, ignoreCantInfer, bindingStrength);
OperationOutcomeIssueComponent issueWithCalculatedSeverity = getTxIssueWithCalculatedSeverity(issue, ignoreCantInfer, bindingStrength); var validationMessage = buildValidationMessage(validationResult.getTxLink(), element.line(), element.col(), path, issueWithCalculatedSeverity);
var validationMessage = buildValidationMessage(validationResult.getTxLink(), element.line(), element.col(), path, issueWithCalculatedSeverity); if (!isSuppressedValidationMessage(path, validationMessage.getMessageId())) {
if (!isSuppressedValidationMessage(path, validationMessage.getMessageId())) { errors.add(validationMessage);
errors.add(validationMessage); if (validationMessage.isError()) {
if (validationMessage.isError()) { noErrorsFound = false;
noErrorsFound = false;
}
}
} }
}
} }
} }
return noErrorsFound; return noErrorsFound;
@ -1748,8 +1749,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
} }
private OperationOutcomeIssueComponent getTxIssueWithCalculatedSeverity(OperationOutcomeIssueComponent issueComponent, boolean ignoreCantInfer, BindingStrength bindingStrength) { private OperationOutcomeIssueComponent getTxIssueWithCalculatedSeverity(OperationOutcomeIssueComponent issueComponent, boolean ignoreCantInfer, BindingStrength bindingStrength) {
OperationOutcomeIssueComponent outIssueComponent = issueComponent.copy(); OperationOutcomeIssueComponent newIssueComponent = issueComponent.copy();
if (outIssueComponent.getDetails().hasCoding("http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", "not-found")) { if (newIssueComponent.getDetails().hasCoding("http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", "not-found")) {
String text = issueComponent.getDetails().getText(); String text = issueComponent.getDetails().getText();
boolean isHL7 = text == null ? false : text.contains("http://hl7.org/fhir") || text.contains("http://terminology.hl7.org"); boolean isHL7 = text == null ? false : text.contains("http://hl7.org/fhir") || text.contains("http://terminology.hl7.org");
org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity notFoundLevel = null; org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity notFoundLevel = null;
@ -1773,17 +1774,17 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
notFoundLevel = org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.WARNING; notFoundLevel = org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.WARNING;
notFoundNote = null; // "binding="+bs.toCode(); notFoundNote = null; // "binding="+bs.toCode();
} }
if (notFoundLevel != null && outIssueComponent.getSeverity().isHigherThan(notFoundLevel)) { // && (vsurl != null && i.getDetails().getText().contains(vsurl))) { if (notFoundLevel != null && newIssueComponent.getSeverity().isHigherThan(notFoundLevel)) { // && (vsurl != null && i.getDetails().getText().contains(vsurl))) {
outIssueComponent.setSeverity(notFoundLevel); newIssueComponent.setSeverity(notFoundLevel);
if (notFoundNote != null) { if (notFoundNote != null) {
outIssueComponent.getDetails().setText(outIssueComponent.getDetails().getText() + " (" + notFoundNote + ")"); newIssueComponent.getDetails().setText(newIssueComponent.getDetails().getText() + " (" + notFoundNote + ")");
} }
} }
} }
if (outIssueComponent.getDetails().hasCoding("http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", "invalid-display") && baseOptions.isDisplayWarningMode() && outIssueComponent.getSeverity() == org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.ERROR) { if (newIssueComponent.getDetails().hasCoding("http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", "invalid-display") && baseOptions.isDisplayWarningMode() && newIssueComponent.getSeverity() == org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.ERROR) {
outIssueComponent.setSeverity(org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.WARNING); newIssueComponent.setSeverity(org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.WARNING);
} }
return outIssueComponent; return newIssueComponent;
} }
public boolean checkBindings(List<ValidationMessage> errors, String path, Element element, NodeStack stack, ValueSet valueset, Coding nextCoding) { public boolean checkBindings(List<ValidationMessage> errors, String path, Element element, NodeStack stack, ValueSet valueset, Coding nextCoding) {