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

clean up handling of xml_name

This commit is contained in:
Grahame Grieve 2023-12-15 02:44:07 -05:00
parent ca694588b6
commit bb020dd739
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/elementmodel/Property.java
View File

@ -72,9 +72,9 @@ public class Property {
} }
public String getXmlName() { public String getXmlName() {
if (definition.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-xml-name")) { if (definition.hasExtension(ToolingExtensions.EXT_XML_NAME)) {
return ToolingExtensions.readStringExtension(definition, return ToolingExtensions.readStringExtension(definition,
"http://hl7.org/fhir/StructureDefinition/elementdefinition-xml-name"); ToolingExtensions.EXT_XML_NAME);
} else { } else {
return getName(); return getName();
} }

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/ParserBase.java
View File

@ -145,7 +145,7 @@ public abstract class ParserBase {
protected StructureDefinition getDefinition(List<ValidationMessage> errors, int line, int col, String ns, String name) throws FHIRFormatError { protected StructureDefinition getDefinition(List<ValidationMessage> errors, int line, int col, String ns, String name) throws FHIRFormatError {
if (logical != null) { if (logical != null) {
String expectedName = ToolingExtensions.readStringExtension(logical, "http://hl7.org/fhir/StructureDefinition/elementdefinition-xml-name"); String expectedName = ToolingExtensions.readStringExtension(logical, ToolingExtensions.EXT_XML_NAME);
if (expectedName == null) { if (expectedName == null) {
expectedName = logical.getType(); expectedName = logical.getType();
if (Utilities.isAbsoluteUrl(expectedName)) { if (Utilities.isAbsoluteUrl(expectedName)) {