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

Fixed issue where validator fails to detect invariant issue when ther… (#554) 

* Fixed issue where validator fails to detect invariant issue when there are multiple profiles that use the same invariant on the same element.  Also addressed issue revealed by the fix where the context resource wasn't being set properly when checking certain invariants (identified by one of the existing test cases).

* Moved notes from code into commit notes (this one) and added Release notes

Changed call to checkInvariants within checkChildByDefinition such that onlyNonInherited is now false because inherited invariants can be overridden and it's important to check both.  Note that this means that onlyNonInherited doesn't seem to be used any more.  @grahamegrieve - consider whether it should be removed.
This commit is contained in:
Lloyd McKenzie 2021-07-06 11:42:35 -06:00 committed by GitHub
parent 1d7e8bf63d
commit 8d29632703
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE_NOTES.md
View File

@ -0,0 +1 @@
Fixed issue where validator fails to detect invariant issue when there are multiple profiles that use the same invariant on the same element. Also addressed issue revealed by the fix where the context resource wasn't being set properly when checking certain invariants (identified by one of the existing test cases).

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

@ -4539,7 +4539,12 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
String thisExtension = null;
boolean checkDisplay = true;
checkInvariants(hostContext, errors, profile, typeDefn != null ? typeDefn : checkDefn, resource, ei.getElement(), localStack, true);
SpecialElement special = ei.getElement().getSpecial();
if (special == SpecialElement.BUNDLE_ENTRY || special == SpecialElement.BUNDLE_OUTCOME || special == SpecialElement.PARAMETER) {
checkInvariants(hostContext, errors, profile, typeDefn != null ? typeDefn : checkDefn, ei.getElement(), ei.getElement(), localStack, false);
} else {
checkInvariants(hostContext, errors, profile, typeDefn != null ? typeDefn : checkDefn, resource, ei.getElement(), localStack, false);
}
ei.getElement().markValidation(profile, checkDefn);
boolean elementValidated = false;
@ -5014,18 +5019,23 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
for (ElementDefinitionConstraintComponent inv : ed.getConstraint()) {
if (inv.hasExpression() && (!onlyNonInherited || !inv.hasSource() || (!isInheritedProfile(profile, inv.getSource()) && !isInheritedProfile(ed.getType(), inv.getSource())) )) {
@SuppressWarnings("unchecked")
Set<String> invList = executionId.equals(element.getUserString(EXECUTION_ID)) ? (Set<String>) element.getUserData(EXECUTED_CONSTRAINT_LIST) : null;
if (invList == null) {
invList = new HashSet<>();
element.setUserData(EXECUTED_CONSTRAINT_LIST, invList);
Map<String, List<ValidationMessage>> invMap = executionId.equals(element.getUserString(EXECUTION_ID)) ? (Map<String, List<ValidationMessage>>) element.getUserData(EXECUTED_CONSTRAINT_LIST) : null;
if (invMap == null) {
invMap = new HashMap<>();
element.setUserData(EXECUTED_CONSTRAINT_LIST, invMap);
element.setUserData(EXECUTION_ID, executionId);
}
if (!invList.contains(inv.getKey())) {
invList.add(inv.getKey());
checkInvariant(hostContext, errors, path, profile, resource, element, inv);
List<ValidationMessage> invErrors = null;
// We key based on inv.expression rather than inv.key because expressions can change in derived profiles and aren't guaranteed to be consistent across profiles.
String key = fixExpr(inv.getExpression(), inv.getKey());
if (!invMap.keySet().contains(key)) {
invErrors = new ArrayList<ValidationMessage>();
invMap.put(key, invErrors);
checkInvariant(hostContext, invErrors, path, profile, resource, element, inv);
} else {
//System.out.println("Skip "+inv.getKey()+" on "+path);
invErrors = (ArrayList<ValidationMessage>)invMap.get(key);
}
errors.addAll(invErrors);
}
}
}