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

exempt ele-1 from constraint consistency checking

This commit is contained in:
Grahame Grieve 2023-06-27 22:19:44 +10:00
parent 4b07f4f7dc
commit ec8e999162
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -575,7 +575,7 @@ public class ValidationEngine implements IValidatorResourceFetcher, IValidationP
} }
if (!found) { if (!found) {
return null; return null;
} else if (!first) { } else if (!first && delay != 0) {
Thread.sleep(delay); Thread.sleep(delay);
} }

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorUtils.java
View File

@ -198,7 +198,7 @@ public class ValidatorUtils {
SourceFile src = addSourceFile(refs, file.getPath()); SourceFile src = addSourceFile(refs, file.getPath());
Long l = file.lastModified(); Long l = file.lastModified();
if (src.date != l) { if (src.date != l) {
src.process = true; src.setProcess(true);
} }
src.date = l; src.date = l;
return src; return src;

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java
View File

@ -487,7 +487,7 @@ public class StructureDefinitionValidator extends BaseValidator {
if (hint(errors, "2023-06-19", IssueType.INFORMATIONAL, stack, !Utilities.noString(expression), I18nConstants.ED_INVARIANT_NO_EXPRESSION, key)) { if (hint(errors, "2023-06-19", IssueType.INFORMATIONAL, stack, !Utilities.noString(expression), I18nConstants.ED_INVARIANT_NO_EXPRESSION, key)) {
if (invariantMap.containsKey(key)) { if (invariantMap.containsKey(key)) {
// it's legal - and common - for a list of elemnts to contain the same invariant more than once, but it's not valid if it's not always the same // it's legal - and common - for a list of elemnts to contain the same invariant more than once, but it's not valid if it's not always the same
ok = rule(errors, "2023-06-19", IssueType.INVALID, stack, expression.equals(invariantMap.get(key)), I18nConstants.ED_INVARIANT_EXPRESSION_CONFLICT, key, expression, invariantMap.get(key)); ok = rule(errors, "2023-06-19", IssueType.INVALID, stack, expression.equals(invariantMap.get(key)) || "ele-1".equals(key), I18nConstants.ED_INVARIANT_EXPRESSION_CONFLICT, key, expression, invariantMap.get(key));
} else { } else {
invariantMap.put(key, expression); invariantMap.put(key, expression);
} }