From 7b60c1b85d39d53f3a9ef226d8c486d5497f5304 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Wed, 21 Apr 2021 17:41:22 +1000 Subject: [PATCH] Fix issue where primitive elements with required bindings must have a value, but this wasn't be checked --- .../org/hl7/fhir/validation/instance/InstanceValidator.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java index 506704856..a1a8742dc 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java @@ -1907,6 +1907,9 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat rule(errors, IssueType.INVALID, e.line(), e.col(), path, e.hasChildren(), I18nConstants.TYPE_SPECIFIC_CHECKS_DT_PRIMITIVE_NOTEMPTY); else if (StringUtils.isWhitespace(e.primitiveValue())) warning(errors, IssueType.INVALID, e.line(), e.col(), path, e.hasChildren(), I18nConstants.TYPE_SPECIFIC_CHECKS_DT_PRIMITIVE_WS); + if (context.hasBinding()) { + rule(errors, IssueType.CODEINVALID, e.line(), e.col(), path, context.getBinding().getStrength() != BindingStrength.REQUIRED, I18nConstants.Terminology_TX_Code_ValueSet_MISSING); + } return; } String regex = context.getExtensionString(ToolingExtensions.EXT_REGEX);