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

fix logical model type testing

This commit is contained in:
Grahame Grieve 2021-09-02 07:35:47 +10:00
parent 3d57a2b511
commit 1e3f5cdabc
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5170,11 +5170,10 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
ok = rule(errors, IssueType.INVALID, element.line(), element.col(), stack.addToLiteralPath(resourceName), defn != null, I18nConstants.VALIDATION_VAL_PROFILE_NODEFINITION, resourceName);
}
String type = defn.getKind() == StructureDefinitionKind.LOGICAL ? defn.getName() : defn.getType();
// special case: we have a bundle, and the profile is not for a bundle. We'll try the first entry instead
if (!type.equals(resourceName) && resourceName.equals(BUNDLE)) {
if (!typeMatchesDefn(resourceName, defn) && resourceName.equals(BUNDLE)) {
NodeStack first = getFirstEntry(stack);
if (first != null && first.getElement().getType().equals(type)) {
if (first != null && typeMatchesDefn(first.getElement().getType(), defn)) {
element = first.getElement();
stack = first;
resourceName = element.getType();
@ -5182,7 +5181,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
}
// todo: validate everything in this bundle.
}
ok = rule(errors, IssueType.INVALID, -1, -1, stack.getLiteralPath(), type.equals(resourceName), I18nConstants.VALIDATION_VAL_PROFILE_WRONGTYPE, type, resourceName);
ok = rule(errors, IssueType.INVALID, -1, -1, stack.getLiteralPath(), typeMatchesDefn(resourceName, defn), I18nConstants.VALIDATION_VAL_PROFILE_WRONGTYPE, defn.getName(), resourceName);
if (ok) {
if (idstatus == IdStatus.REQUIRED && (element.getNamedChild(ID) == null)) {
@ -5201,6 +5200,14 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
}
}
private boolean typeMatchesDefn(String name, StructureDefinition defn) {
if (defn.getKind() == StructureDefinitionKind.LOGICAL) {
return name.equals(defn.getType()) || name.equals(defn.getName()) || name.equals(defn.getId());
} else {
return name.matches(defn.getType());
}
}
private NodeStack getFirstEntry(NodeStack bundle) {
List<Element> list = new ArrayList<Element>();
bundle.getElement().getNamedChildren(ENTRY, list);