From c16573962ba2ff93a464312525a7a2c350bcb81b Mon Sep 17 00:00:00 2001
From: Oliver Egger <oliver.egger@ahdis.ch>
Date: Sat, 2 Jan 2021 14:19:04 +0100
Subject: [PATCH] noNamespace instead of default

---
 .../main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java   | 6 +++---
 .../src/main/java/org/hl7/fhir/utilities/xml/XMLWriter.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java
index e2a7c641a..3b01a0ab3 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java
@@ -188,7 +188,7 @@ public class XmlParser extends ParserBase {
     String name = element.getLocalName();
     String path = "/"+pathPrefix(ns)+name;
     
-    StructureDefinition sd = getDefinition(line(element), col(element), (ns == null ? "default" : ns), name);
+    StructureDefinition sd = getDefinition(line(element), col(element), (ns == null ? "noNamespace" : ns), name);
     if (sd == null)
       return null;
 
@@ -242,7 +242,7 @@ public class XmlParser extends ParserBase {
       String ns = prop.getXmlNamespace();
       String elementNs = element.getNamespaceURI();
       if (elementNs == null) {
-        elementNs = "default";
+        elementNs = "noNamespace";
       }
       if (!elementNs.equals(ns))
         logError(line(element), col(element), path, IssueType.INVALID, context.formatMessage(I18nConstants.WRONG_NAMESPACE__EXPECTED_, ns), IssueSeverity.ERROR);
@@ -544,7 +544,7 @@ public class XmlParser extends ParserBase {
     xml.setPretty(style == OutputStyle.PRETTY);
     xml.start();
     String ns = e.getProperty().getXmlNamespace();
-    if (ns!=null && !"default".equals(ns)) {
+    if (ns!=null && !"noNamespace".equals(ns)) {
       xml.setDefaultNamespace(ns);
     }
     if (hasTypeAttr(e))
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xml/XMLWriter.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xml/XMLWriter.java
index fd4fec5bc..3854919cf 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xml/XMLWriter.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xml/XMLWriter.java
@@ -450,7 +450,7 @@ public class XMLWriter extends OutputStreamWriter implements IXMLWriter {
 		if ("http://www.w3.org/XML/1998/namespace".equals(namespace))
 			return "xml:";
 		
-		if (namespace == null || "".equals(namespace) || "default".equals(namespace))
+		if (namespace == null || "".equals(namespace) || "noNamespace".equals(namespace))
 			return "";
 		
 		XMLNamespace ns = findByNamespace(namespace);