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 to compile + adjust validator messages

This commit is contained in:
Grahame Grieve 2020-02-29 06:21:02 +11:00
parent 95959ed01a
commit b15d72a755
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1403,10 +1403,10 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
if (xverManager.matchingUrl(url)) { if (xverManager.matchingUrl(url)) {
switch (xverManager.status(url)) { switch (xverManager.status(url)) {
case BadVersion: case BadVersion:
rule(errors, IssueType.INVALID, element.line(), element.col(), path + "[url='" + url + "']", false, "Extension url '" + url + "' is not valid (invalidVersion \"" + xverManager.getVersion(url) + "\")"); rule(errors, IssueType.INVALID, element.line(), element.col(), path + "[url='" + url + "']", false, "Extension url '" + url + "' is not valid (invalid Version \"" + xverManager.getVersion(url) + "\")");
break; break;
case Unknown: case Unknown:
rule(errors, IssueType.INVALID, element.line(), element.col(), path + "[url='" + url + "']", false, "Extension url '" + url + "' is not valid (unknown Element id \"" + xverManager.getElementId(url) + "\")"); rule(errors, IssueType.INVALID, element.line(), element.col(), path + "[url='" + url + "']", false, "Extension url '" + url + "' is not valid (invalid Element id \"" + xverManager.getElementId(url) + "\")");
break; break;
case Invalid: case Invalid:
rule(errors, IssueType.INVALID, element.line(), element.col(), path + "[url='" + url + "']", false, "Extension url '" + url + "' is not valid (Element id \"" + xverManager.getElementId(url) + "\" is valid, but cannot be used in a cross-version paradigm because there has been no changes across the relevant versions)"); rule(errors, IssueType.INVALID, element.line(), element.col(), path + "[url='" + url + "']", false, "Extension url '" + url + "' is not valid (Element id \"" + xverManager.getElementId(url) + "\" is valid, but cannot be used in a cross-version paradigm because there has been no changes across the relevant versions)");
@ -1783,7 +1783,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
if (e.primitiveValue() == null) if (e.primitiveValue() == null)
rule(errors, IssueType.INVALID, e.line(), e.col(), path, e.hasChildren(), "Primitive types must have a value or must have child extensions"); rule(errors, IssueType.INVALID, e.line(), e.col(), path, e.hasChildren(), "Primitive types must have a value or must have child extensions");
else if (e.primitiveValue().length() == 0) else if (e.primitiveValue().length() == 0)
rule(errors, IssueType.INVALID, e.line(), e.col(), path, e.hasChildren(), "Primitive types must have a value that is not empty"); rule(errors, IssueType.INVALID, e.line(), e.col(), path, e.hasChildren(), "@value cannot be empty");
else if (StringUtils.isWhitespace(e.primitiveValue())) else if (StringUtils.isWhitespace(e.primitiveValue()))
warning(errors, IssueType.INVALID, e.line(), e.col(), path, e.hasChildren(), "Primitive types should not only be whitespace"); warning(errors, IssueType.INVALID, e.line(), e.col(), path, e.hasChildren(), "Primitive types should not only be whitespace");
return; return;

5
org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTestSuite.java
View File

@ -118,7 +118,10 @@ public class ValidationTestSuite implements IEvaluationContext, IValidatorResour
} }
vCurr = ve.get(v); vCurr = ve.get(v);
vCurr.setFetcher(this); vCurr.setFetcher(this);
TestingUtilities.fcontext = vCurr.getContext(); if (TestingUtilities.fcontexts == null) {
TestingUtilities.fcontexts = new HashMap<>();
}
TestingUtilities.fcontexts.put(v, vCurr.getContext());
if (content.has("use-test") && !content.get("use-test").getAsBoolean()) if (content.has("use-test") && !content.get("use-test").getAsBoolean())
return; return;