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

Improve naming of error flag on profile registration

This commit is contained in:
James Agnew 2019-08-07 05:37:03 -04:00
parent c1728a481d
commit ce392c47bb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ValidationProfileSet.java
View File

@ -32,18 +32,18 @@ public class ValidationProfileSet {
public static class ProfileRegistration { public static class ProfileRegistration {
private String profile; private String profile;
private boolean error; private boolean errorOnMissing;
public ProfileRegistration(String profile, boolean error) { public ProfileRegistration(String profile, boolean errorOnMissing) {
super(); super();
this.profile = profile; this.profile = profile;
this.error = error; this.errorOnMissing = errorOnMissing;
} }
public String getProfile() { public String getProfile() {
return profile; return profile;
} }
public boolean isError() { public boolean isErrorOnMissing() {
return error; return errorOnMissing;
} }

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

@ -452,11 +452,11 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
if (!ok) if (!ok)
errors.add(new ValidationMessage(Source.InstanceValidator, IssueType.UNKNOWN, path, "Profile mismatch on type for "+profile.getProfile()+": the profile constrains "+sd.getType()+" but the element is "+element.fhirType(), IssueSeverity.ERROR)); errors.add(new ValidationMessage(Source.InstanceValidator, IssueType.UNKNOWN, path, "Profile mismatch on type for "+profile.getProfile()+": the profile constrains "+sd.getType()+" but the element is "+element.fhirType(), IssueSeverity.ERROR));
} else } else
addProfile(errors, profile.getProfile(), profile.isError(), path, element, sd); addProfile(errors, profile.getProfile(), profile.isErrorOnMissing(), path, element, sd);
} }
} }
public boolean addProfile(List<ValidationMessage> errors, String profile, boolean error, String path, Element element, StructureDefinition containingProfile) { public boolean addProfile(List<ValidationMessage> errors, String profile, boolean errorOnMissing, String path, Element element, StructureDefinition containingProfile) {
String effectiveProfile = profile; String effectiveProfile = profile;
String version = null; String version = null;
if (profile.contains("|")) { if (profile.contains("|")) {
@ -481,7 +481,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
sd = context.fetchResource(StructureDefinition.class, effectiveProfile); sd = context.fetchResource(StructureDefinition.class, effectiveProfile);
} }
if (warningOrError(error, errors, IssueType.INVALID, element.line(), element.col(), path, sd != null, "StructureDefinition reference \"{0}\" could not be resolved", profile)) { if (warningOrError(errorOnMissing, errors, IssueType.INVALID, element.line(), element.col(), path, sd != null, "StructureDefinition reference \"{0}\" could not be resolved", profile)) {
if (rule(errors, IssueType.STRUCTURE, element.line(), element.col(), path, version==null || (sd.getVersion()!=null && sd.getVersion().equals(version)), if (rule(errors, IssueType.STRUCTURE, element.line(), element.col(), path, version==null || (sd.getVersion()!=null && sd.getVersion().equals(version)),
"Referenced version " + version + " does not match found version " + sd.getVersion() + " for profile " + sd.getUrl(), profile)) { "Referenced version " + version + " does not match found version " + sd.getVersion() + " for profile " + sd.getUrl(), profile)) {
if (rule(errors, IssueType.STRUCTURE, element.line(), element.col(), path, sd.hasSnapshot(), if (rule(errors, IssueType.STRUCTURE, element.line(), element.col(), path, sd.hasSnapshot(),