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 bug checking reference type and allow tools extensions

This commit is contained in:
Grahame Grieve 2020-01-24 17:19:33 +11:00
parent ce28b6d1eb
commit f69173d445
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
View File

@ -1937,7 +1937,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
if (fetcher != null) {
boolean found;
try {
found = (allowExamples && (url.contains("example.org") || url.contains("acme.com"))) || fetcher.resolveURL(appContext, path, url);
found = (allowExamples && (url.contains("example.org") || url.contains("acme.com"))) || (url.startsWith("http://hl7.org/fhir/tools")) || fetcher.resolveURL(appContext, path, url);
} catch (IOException e1) {
found = false;
}
@ -2376,7 +2376,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
}
if (we == null) {
TypeRefComponent type = getReferenceTypeRef(container.getType());
rule(errors, IssueType.REQUIRED, -1, -1, path, !type.hasAggregation() || !type.hasAggregation(AggregationMode.REFERENCED), "Bundled or contained reference not found within the bundle/resource " + ref);
boolean okToRef = !type.hasAggregation() || type.hasAggregation(AggregationMode.REFERENCED);
rule(errors, IssueType.REQUIRED, -1, -1, path, okToRef, "Bundled or contained reference not found within the bundle/resource " + ref);
}
if (pol == ReferenceValidationPolicy.CHECK_VALID) {
// todo....