nodes) {
+ for (XhtmlNode node : nodes) {
+ addChildNode(node);
+ }
+ }
+
+ public void addChildNode(XhtmlNode node) {
+ checkWhenAddingNode(node);
+ getChildNodes().add(node);
+ }
+
+
+ private void checkWhenAddingNode(XhtmlNode node) {
+ if (checkPara) {
+ if (isInPara) {
+ if (Utilities.existsInList(node.name, "div", "blockquote", "table", "ol", "ul", "p")) {
+ throw new Error("Error: attempt to add "+node.name+" inside an html paragraph");
+ }
+ node.isInPara = true;
+ }
+ }
+ }
+
+ public void addChildNode(int index, XhtmlNode node) {
+ checkWhenAddingNode(node);
+ getChildNodes().add(index, node);
+ }
+
+
+ public static boolean isCheckPara() {
+ return checkPara;
+ }
+
+
+ public static void setCheckPara(boolean checkPara) {
+ XhtmlNode.checkPara = checkPara;
+ }
+
}
\ No newline at end of file
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java
index f7db1cc7f..cb899d208 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java
@@ -371,7 +371,7 @@ public class XhtmlParser {
res.addComment(child.getTextContent());
} else if (child.getNodeType() == Node.ELEMENT_NODE) {
if (elementIsOk(child.getLocalName()))
- res.getChildNodes().add(parseNode((Element) child, defaultNS));
+ res.addChildNode(parseNode((Element) child, defaultNS));
} else
throw new FHIRFormatError("Unhandled XHTML feature: "+Integer.toString(child.getNodeType())+descLoc());
child = child.getNextSibling();
@@ -418,7 +418,7 @@ public class XhtmlParser {
xpp.next();
} else if (eventType == XmlPullParser.START_TAG) {
if (elementIsOk(xpp.getName()))
- res.getChildNodes().add(parseNode(xpp));
+ res.addChildNode(parseNode(xpp));
} else
throw new FHIRFormatError("Unhandled XHTML feature: "+Integer.toString(eventType)+descLoc());
eventType = xpp.getEventType();
@@ -630,12 +630,12 @@ public class XhtmlParser {
return;
if (i == parents.size())
{
- parents.get(i - 1).getChildNodes().addAll(node.getChildNodes());
+ parents.get(i - 1).addChildNodes(node.getChildNodes());
node.getChildNodes().clear();
}
else
{
- parents.get(i - 1).getChildNodes().addAll(parents.get(i).getChildNodes());
+ parents.get(i - 1).addChildNodes(parents.get(i).getChildNodes());
parents.get(i).getChildNodes().clear();
}
}
diff --git a/org.hl7.fhir.utilities/src/main/resources/Messages.properties b/org.hl7.fhir.utilities/src/main/resources/Messages.properties
index f7f4899f9..eca321a07 100644
--- a/org.hl7.fhir.utilities/src/main/resources/Messages.properties
+++ b/org.hl7.fhir.utilities/src/main/resources/Messages.properties
@@ -1126,3 +1126,7 @@ IG_DEPENDENCY_VERSION_ERROR = The ImplementationGuide is based on FHIR version {
IG_DEPENDENCY_VERSION_WARNING = The ImplementationGuide is based on FHIR version {0} but package {1} is based on FHIR version {2}. In general, this version mismatch should be avoided - some tools will try to make this work with variable degrees of success, but others will not even try
IG_DEPENDENCY_EXCEPTION = Exception checking package version consistency: {0}
NDJSON_EMPTY_LINE_WARNING = The NDJSON source contains an empty line. This may not be accepted by some processors
+TYPE_SPECIFIC_CHECKS_DT_XHTML_EMPTY_HREF = Hyperlink at ''{0}'' for ''{1}'' is empty
+TYPE_SPECIFIC_CHECKS_DT_XHTML_ACTIVE_HREF = Hyperlink scheme ''{3}'' in ''{0}'' at ''{1}'' for ''{2}'' has active content, which is a security risk and not allowed
+TYPE_SPECIFIC_CHECKS_DT_XHTML_UNKNOWN_HREF = Hyperlink scheme ''{3}'' in ''{0}'' at ''{1}'' for ''{2}'' is not a widely supported protocol and should be checked
+TYPE_SPECIFIC_CHECKS_DT_XHTML_LITERAL_HREF = Hyperlink scheme ''{3}'' in ''{0}'' at ''{1}'' for ''{2}'' is not a valid hyperlinkable scheme
diff --git a/org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties b/org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties
index 25c4cb531..afe32b831 100644
--- a/org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties
+++ b/org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties
@@ -909,4 +909,4 @@ DOCUMENT_SUMMARY = Document at by refs = new HashSet<>();
- int count = countTargetMatches(resource, ref, true, "$", refs);
- if (count == 0) {
- rule(errors, NO_RULE_DATE, IssueType.INVALID, e.line(), e.col(), path, false, I18nConstants.TYPE_SPECIFIC_CHECKS_DT_XHTML_RESOLVE, href, xpath, Utilities.stripEoln(node.allText()));
- } else if (count > 1) {
- warning(errors, NO_RULE_DATE, IssueType.INVALID, e.line(), e.col(), path, false, I18nConstants.TYPE_SPECIFIC_CHECKS_DT_XHTML_MULTIPLE_MATCHES, href, xpath, node.allText(), CommaSeparatedStringBuilder.join(", ", refs));
+ if (rule(errors, "2024-07-20", IssueType.INVALID, e.line(), e.col(), path, !Utilities.noString(href), I18nConstants.TYPE_SPECIFIC_CHECKS_DT_XHTML_EMPTY_HREF, xpath, Utilities.stripEoln(node.allText()))) {
+ if ( href.startsWith("#") && !href.equals("#")) {
+ String ref = href.substring(1);
+ valContext.getInternalRefs().add(ref);
+ Set refs = new HashSet<>();
+ int count = countTargetMatches(resource, ref, true, "$", refs);
+ if (count == 0) {
+ rule(errors, NO_RULE_DATE, IssueType.INVALID, e.line(), e.col(), path, false, I18nConstants.TYPE_SPECIFIC_CHECKS_DT_XHTML_RESOLVE, href, xpath, Utilities.stripEoln(node.allText()).trim());
+ } else if (count > 1) {
+ warning(errors, NO_RULE_DATE, IssueType.INVALID, e.line(), e.col(), path, false, I18nConstants.TYPE_SPECIFIC_CHECKS_DT_XHTML_MULTIPLE_MATCHES, href, xpath, node.allText(), CommaSeparatedStringBuilder.join(", ", refs));
+ }
+ } else if (href.contains(":")) {
+ String scheme = href.substring(0, href.indexOf(":"));
+ if (rule(errors, "2024-07-20", IssueType.INVALID, e.line(), e.col(), path, !isActiveScheme(scheme), I18nConstants.TYPE_SPECIFIC_CHECKS_DT_XHTML_ACTIVE_HREF, href, xpath, Utilities.stripEoln(node.allText()).trim(), scheme)) {
+ if (rule(errors, "2024-07-20", IssueType.INVALID, e.line(), e.col(), path, isLiteralScheme(scheme), I18nConstants.TYPE_SPECIFIC_CHECKS_DT_XHTML_LITERAL_HREF, href, xpath, Utilities.stripEoln(node.allText()).trim(), scheme)) {
+ hint(errors, NO_RULE_DATE, IssueType.INVALID, e.line(), e.col(), path, isKnownScheme(scheme), I18nConstants.TYPE_SPECIFIC_CHECKS_DT_XHTML_UNKNOWN_HREF, href, xpath, node.allText().trim(), scheme);
+ } else {
+ ok = false;
+ }
+ } else {
+ ok = false;
+ }
+ } else {
+ // we can't validate at this point. Come back and revisit this some time in the future
}
- } else {
- // we can't validate at this point. Come back and revisit this some time in the future
}
}
if (node.hasChildren()) {
@@ -3338,6 +3351,18 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
}
+ private boolean isActiveScheme(String scheme) {
+ return Utilities.existsInList(scheme, "javascript", "vbscript");
+ }
+
+ private boolean isLiteralScheme(String scheme) {
+ return !Utilities.existsInList(scheme, "urn", "cid");
+ }
+
+ private boolean isKnownScheme(String scheme) {
+ return Utilities.existsInList(scheme, "http", "https", "tel", "mailto", "data");
+ }
+
protected int countTargetMatches(Element element, String fragment, boolean checkBundle, String path,Set refs) {
int count = 0;
if (fragment.equals(element.getIdBase())) {
@@ -4647,7 +4672,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
}
}
if (focus.getSpecial() == SpecialElement.PARAMETER && focus.getParentForValidator() != null) {
- NodeStack tgt = findInParams(focus.getParentForValidator().getParentForValidator(), ref, stack);
+ NodeStack tgt = findInParams(findParameters(focus), ref, stack);
if (tgt != null) {
ResolvedReference rr = new ResolvedReference();
rr.setResource(tgt.getElement());
@@ -4684,7 +4709,20 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
return null;
}
+ private Element findParameters(Element focus) {
+ while (focus != null) {
+ if ("Parameters".equals(focus.fhirType())) {
+ return focus;
+ }
+ focus = focus.getParentForValidator();
+ }
+ return null;
+ }
+
private NodeStack findInParams(Element params, String ref, NodeStack stack) {
+ if (params == null) {
+ return null;
+ }
int i = 0;
for (Element child : params.getChildren("parameter")) {
NodeStack p = stack.push(child, i, child.getProperty().getDefinition(), child.getProperty().getDefinition());
diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache
index e7d68aabd..64775d51e 100644
--- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache
+++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache
@@ -3651,3 +3651,52 @@ v: {
}
-------------------------------------------------------------------------------------
+{"code" : {
+ "code" : "OK"
+}, "valueSet" :{
+ "resourceType" : "ValueSet",
+ "compose" : {
+ "include" : [{
+ "system" : "https://www.usps.com/"
+ }]
+ }
+}, "langs":"en", "useServer":"true", "useClient":"false", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "Oklahoma",
+ "code" : "OK",
+ "system" : "https://www.usps.com/",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "code" : "OK"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/us-core-usps-state", "version": "6.1.0", "langs":"en", "useServer":"true", "useClient":"true", "guessSystem":"true", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "Oklahoma",
+ "code" : "OK",
+ "system" : "https://www.usps.com/",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___www.ama-assn.org_go_cpt.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___www.ama-assn.org_go_cpt.cache
index d169bb757..7480b30b1 100644
--- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___www.ama-assn.org_go_cpt.cache
+++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___www.ama-assn.org_go_cpt.cache
@@ -15,10 +15,51 @@ v: {
"system" : "http://www.ama-assn.org/go/cpt",
"version" : "2023",
"server" : "http://tx-dev.fhir.org/r4",
- "unknown-systems" : "",
"issues" : {
"resourceType" : "OperationOutcome"
}
}
-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "http://www.ama-assn.org/go/cpt",
+ "code" : "43235",
+ "display" : "Esophagogastroduodenoscopy (EGD), a tiny camera at the end of a flexible tube inserted through the mouth and into the esophagus (a tube that carries food and liquid to the stomach), stomach and small intestine with removal of tissue"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"false", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "Esophagogastroduodenoscopy, flexible, transoral; diagnostic, including collection of specimen(s) by brushing or washing, when performed (separate procedure)",
+ "code" : "43235",
+ "severity" : "error",
+ "error" : "Wrong Display Name 'Esophagogastroduodenoscopy (EGD), a tiny camera at the end of a flexible tube inserted through the mouth and into the esophagus (a tube that carries food and liquid to the stomach), stomach and small intestine with removal of tissue' for http://www.ama-assn.org/go/cpt#43235. Valid display is 'Esophagogastroduodenoscopy, flexible, transoral; diagnostic, including collection of specimen(s) by brushing or washing, when performed (separate procedure)' (en) (for the language(s) '--')",
+ "class" : "UNKNOWN",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome",
+ "issue" : [{
+ "extension" : [{
+ "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+ "valueUrl" : "http://tx-dev.fhir.org/r4"
+ }],
+ "severity" : "error",
+ "code" : "invalid",
+ "details" : {
+ "coding" : [{
+ "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+ "code" : "invalid-display"
+ }],
+ "text" : "Wrong Display Name 'Esophagogastroduodenoscopy (EGD), a tiny camera at the end of a flexible tube inserted through the mouth and into the esophagus (a tube that carries food and liquid to the stomach), stomach and small intestine with removal of tissue' for http://www.ama-assn.org/go/cpt#43235. Valid display is 'Esophagogastroduodenoscopy, flexible, transoral; diagnostic, including collection of specimen(s) by brushing or washing, when performed (separate procedure)' (en) (for the language(s) '--')"
+ },
+ "location" : ["Coding.display"],
+ "expression" : ["Coding.display"]
+ }]
+}
+
+}
+-------------------------------------------------------------------------------------
diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/urn_oid_2.16.840.1.113883.6.238.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/urn_oid_2.16.840.1.113883.6.238.cache
new file mode 100644
index 000000000..bc00d82d5
--- /dev/null
+++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/urn_oid_2.16.840.1.113883.6.238.cache
@@ -0,0 +1,529 @@
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "2106-3",
+ "display" : "White"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/omb-race-category", "version": "6.1.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "White",
+ "code" : "2106-3",
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "version" : "1.2",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "1002-5",
+ "display" : "American Indian or Alaska Native"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/omb-race-category", "version": "6.1.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "American Indian or Alaska Native",
+ "code" : "1002-5",
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "version" : "1.2",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "2028-9",
+ "display" : "Asian"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/omb-race-category", "version": "6.1.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "Asian",
+ "code" : "2028-9",
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "version" : "1.2",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "1586-7",
+ "display" : "Shoshone"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/detailed-race", "version": "6.1.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "Shoshone",
+ "code" : "1586-7",
+ "severity" : "error",
+ "error" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#1586-7 ('Shoshone')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-race|6.1.0'",
+ "class" : "UNKNOWN",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome",
+ "issue" : [{
+ "extension" : [{
+ "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+ "valueUrl" : "http://tx-dev.fhir.org/r4"
+ }],
+ "severity" : "error",
+ "code" : "code-invalid",
+ "details" : {
+ "coding" : [{
+ "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+ "code" : "not-in-vs"
+ }],
+ "text" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#1586-7 ('Shoshone')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-race|6.1.0'"
+ },
+ "location" : ["Coding.code"],
+ "expression" : ["Coding.code"]
+ }]
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "2036-2",
+ "display" : "Filipino"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/detailed-race", "version": "6.1.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "Filipino",
+ "code" : "2036-2",
+ "severity" : "error",
+ "error" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#2036-2 ('Filipino')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-race|6.1.0'",
+ "class" : "UNKNOWN",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome",
+ "issue" : [{
+ "extension" : [{
+ "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+ "valueUrl" : "http://tx-dev.fhir.org/r4"
+ }],
+ "severity" : "error",
+ "code" : "code-invalid",
+ "details" : {
+ "coding" : [{
+ "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+ "code" : "not-in-vs"
+ }],
+ "text" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#2036-2 ('Filipino')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-race|6.1.0'"
+ },
+ "location" : ["Coding.code"],
+ "expression" : ["Coding.code"]
+ }]
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "2135-2",
+ "display" : "Hispanic or Latino"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/omb-ethnicity-category", "version": "6.1.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "Hispanic or Latino",
+ "code" : "2135-2",
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "version" : "1.2",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "2184-0",
+ "display" : "Dominican"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/detailed-ethnicity", "version": "6.1.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "Dominican",
+ "code" : "2184-0",
+ "severity" : "error",
+ "error" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#2184-0 ('Dominican')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-ethnicity|6.1.0'",
+ "class" : "UNKNOWN",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome",
+ "issue" : [{
+ "extension" : [{
+ "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+ "valueUrl" : "http://tx-dev.fhir.org/r4"
+ }],
+ "severity" : "error",
+ "code" : "code-invalid",
+ "details" : {
+ "coding" : [{
+ "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+ "code" : "not-in-vs"
+ }],
+ "text" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#2184-0 ('Dominican')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-ethnicity|6.1.0'"
+ },
+ "location" : ["Coding.code"],
+ "expression" : ["Coding.code"]
+ }]
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "2148-5",
+ "display" : "Mexican"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/detailed-ethnicity", "version": "6.1.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "Mexican",
+ "code" : "2148-5",
+ "severity" : "error",
+ "error" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#2148-5 ('Mexican')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-ethnicity|6.1.0'",
+ "class" : "UNKNOWN",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome",
+ "issue" : [{
+ "extension" : [{
+ "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+ "valueUrl" : "http://tx-dev.fhir.org/r4"
+ }],
+ "severity" : "error",
+ "code" : "code-invalid",
+ "details" : {
+ "coding" : [{
+ "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+ "code" : "not-in-vs"
+ }],
+ "text" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#2148-5 ('Mexican')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-ethnicity|6.1.0'"
+ },
+ "location" : ["Coding.code"],
+ "expression" : ["Coding.code"]
+ }]
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "2106-3",
+ "display" : "White"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/omb-race-category", "version": "6.1.0", "langs":"en", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "White",
+ "code" : "2106-3",
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "version" : "1.2",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "1002-5",
+ "display" : "American Indian or Alaska Native"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/omb-race-category", "version": "6.1.0", "langs":"en", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "American Indian or Alaska Native",
+ "code" : "1002-5",
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "version" : "1.2",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "2028-9",
+ "display" : "Asian"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/omb-race-category", "version": "6.1.0", "langs":"en", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "Asian",
+ "code" : "2028-9",
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "version" : "1.2",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "1586-7",
+ "display" : "Shoshone"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/detailed-race", "version": "6.1.0", "langs":"en", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "Shoshone",
+ "code" : "1586-7",
+ "severity" : "error",
+ "error" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#1586-7 ('Shoshone')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-race|6.1.0'",
+ "class" : "UNKNOWN",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome",
+ "issue" : [{
+ "extension" : [{
+ "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+ "valueUrl" : "http://tx-dev.fhir.org/r4"
+ }],
+ "severity" : "error",
+ "code" : "code-invalid",
+ "details" : {
+ "coding" : [{
+ "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+ "code" : "not-in-vs"
+ }],
+ "text" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#1586-7 ('Shoshone')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-race|6.1.0'"
+ },
+ "location" : ["Coding.code"],
+ "expression" : ["Coding.code"]
+ }]
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "2036-2",
+ "display" : "Filipino"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/detailed-race", "version": "6.1.0", "langs":"en", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "Filipino",
+ "code" : "2036-2",
+ "severity" : "error",
+ "error" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#2036-2 ('Filipino')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-race|6.1.0'",
+ "class" : "UNKNOWN",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome",
+ "issue" : [{
+ "extension" : [{
+ "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+ "valueUrl" : "http://tx-dev.fhir.org/r4"
+ }],
+ "severity" : "error",
+ "code" : "code-invalid",
+ "details" : {
+ "coding" : [{
+ "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+ "code" : "not-in-vs"
+ }],
+ "text" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#2036-2 ('Filipino')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-race|6.1.0'"
+ },
+ "location" : ["Coding.code"],
+ "expression" : ["Coding.code"]
+ }]
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "2135-2",
+ "display" : "Hispanic or Latino"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/omb-ethnicity-category", "version": "6.1.0", "langs":"en", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "Hispanic or Latino",
+ "code" : "2135-2",
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "version" : "1.2",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "2184-0",
+ "display" : "Dominican"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/detailed-ethnicity", "version": "6.1.0", "langs":"en", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "Dominican",
+ "code" : "2184-0",
+ "severity" : "error",
+ "error" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#2184-0 ('Dominican')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-ethnicity|6.1.0'",
+ "class" : "UNKNOWN",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome",
+ "issue" : [{
+ "extension" : [{
+ "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+ "valueUrl" : "http://tx-dev.fhir.org/r4"
+ }],
+ "severity" : "error",
+ "code" : "code-invalid",
+ "details" : {
+ "coding" : [{
+ "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+ "code" : "not-in-vs"
+ }],
+ "text" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#2184-0 ('Dominican')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-ethnicity|6.1.0'"
+ },
+ "location" : ["Coding.code"],
+ "expression" : ["Coding.code"]
+ }]
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "urn:oid:2.16.840.1.113883.6.238",
+ "code" : "2148-5",
+ "display" : "Mexican"
+}, "url": "http://hl7.org/fhir/us/core/ValueSet/detailed-ethnicity", "version": "6.1.0", "langs":"en", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ }]
+}}####
+v: {
+ "display" : "Mexican",
+ "code" : "2148-5",
+ "severity" : "error",
+ "error" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#2148-5 ('Mexican')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-ethnicity|6.1.0'",
+ "class" : "UNKNOWN",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "",
+ "issues" : {
+ "resourceType" : "OperationOutcome",
+ "issue" : [{
+ "extension" : [{
+ "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+ "valueUrl" : "http://tx-dev.fhir.org/r4"
+ }],
+ "severity" : "error",
+ "code" : "code-invalid",
+ "details" : {
+ "coding" : [{
+ "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+ "code" : "not-in-vs"
+ }],
+ "text" : "The provided code 'urn:oid:2.16.840.1.113883.6.238#2148-5 ('Mexican')' was not found in the value set 'http://hl7.org/fhir/us/core/ValueSet/detailed-ethnicity|6.1.0'"
+ },
+ "location" : ["Coding.code"],
+ "expression" : ["Coding.code"]
+ }]
+}
+
+}
+-------------------------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ed63737a6..273c090c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
1.26.0
32.0.1-jre
6.4.1
- 1.5.16
+ 1.5.17-SNAPSHOT
2.17.0
5.9.2
1.8.2