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 issues validating resources with references

This commit is contained in:
Grahame Grieve 2019-10-02 14:51:43 +10:00
parent 511ff03657
commit 3e5fadecb0
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/ValidationEngine.java
View File

@ -103,6 +103,7 @@ import org.hl7.fhir.convertors.VersionConvertor_30_50;
import org.hl7.fhir.convertors.VersionConvertor_40_50;
import org.hl7.fhir.exceptions.DefinitionException;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.exceptions.FHIRFormatError;
import org.hl7.fhir.r5.conformance.ProfileUtilities;
import org.hl7.fhir.r5.context.SimpleWorkerContext;
import org.hl7.fhir.r5.context.SimpleWorkerContext.IContextResourceLoader;
@ -134,7 +135,9 @@ import org.hl7.fhir.r5.model.StructureMap;
import org.hl7.fhir.r5.terminologies.ConceptMapEngine;
import org.hl7.fhir.r5.utils.IResourceValidator.BestPracticeWarningLevel;
import org.hl7.fhir.r5.utils.IResourceValidator.CheckDisplayOption;
import org.hl7.fhir.r5.utils.IResourceValidator.IValidatorResourceFetcher;
import org.hl7.fhir.r5.utils.IResourceValidator.IdStatus;
import org.hl7.fhir.r5.utils.IResourceValidator.ReferenceValidationPolicy;
import org.hl7.fhir.r5.utils.FHIRPathEngine;
import org.hl7.fhir.r5.utils.NarrativeGenerator;
import org.hl7.fhir.r5.utils.OperationOutcomeUtilities;
@ -201,7 +204,7 @@ import org.xml.sax.SAXException;
* @author Grahame Grieve
*
*/
public class ValidationEngine {
public class ValidationEngine implements IValidatorResourceFetcher {
public class ScanOutputItem {
private String ref;
@ -1282,6 +1285,7 @@ public class ValidationEngine {
validator.setAnyExtensionsAllowed(anyExtensionsAllowed);
validator.setNoInvariantChecks(isNoInvariantChecks());
validator.setValidationLanguage(language);
validator.setFetcher(this);
return validator;
}
@ -1557,5 +1561,26 @@ public class ValidationEngine {
return names;
}
@Override
public Element fetch(Object appContext, String url) throws FHIRFormatError, DefinitionException, FHIRException, IOException {
return null;
}
@Override
public ReferenceValidationPolicy validationPolicy(Object appContext, String path, String url) {
if (!url.startsWith("http://hl7.org/fhir"))
return ReferenceValidationPolicy.IGNORE;
throw new Error("Not done yet");
}
@Override
public boolean resolveURL(Object appContext, String path, String url) throws IOException, FHIRException {
if (!url.startsWith("http://hl7.org/fhir"))
return true; // we don't bother with those.
if (context.fetchResource(Resource.class, url) != null)
return true;
throw new Error("Not done yet - resolve "+url);
}
}