honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add namespace, prefix for attributes (xml:lang) (#2112)

This commit is contained in:
Oliver Egger 2020-10-11 21:25:37 +02:00 committed by GitHub
parent 576f6efc39
commit 8294b8ddb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
View File

@ -705,12 +705,6 @@ public class XmlParser extends BaseParser {
theEventWriter.writeStartElement(prefix, se.getName().getLocalPart(), namespaceURI);
theEventWriter.writeNamespace(prefix, namespaceURI);
}
// for (Iterator<Attribute> iter= se.getAttributes(); iter.hasNext(); ) {
// Attribute next = iter.next();
// if ("lang".equals(next.getName().getLocalPart())) {
// theEventWriter.writeAttribute("", "", next.getName().getLocalPart(), next.getValue());
// }
// }
firstElement = false;
} else {
if (isBlank(se.getName().getPrefix())) {
@ -730,7 +724,11 @@ public class XmlParser extends BaseParser {
}
for (Iterator<?> attrIter = se.getAttributes(); attrIter.hasNext(); ) {
Attribute next = (Attribute) attrIter.next();
theEventWriter.writeAttribute(next.getName().getLocalPart(), next.getValue());
if (isBlank(next.getName().getNamespaceURI())) {
theEventWriter.writeAttribute(next.getName().getLocalPart(), next.getValue());
} else {
theEventWriter.writeAttribute(next.getName().getPrefix(), next.getName().getNamespaceURI(), next.getName().getLocalPart(), next.getValue());
}
}
break;
case XMLStreamConstants.DTD:

37
hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/XmlParserR4Test.java
View File

@ -1,14 +1,14 @@
package ca.uhn.fhir.parser;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.stringContainsInOrder;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.hamcrest.MatcherAssert.assertThat;
import ca.uhn.fhir.test.BaseTest;
import java.io.IOException;
import java.net.URL;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.r4.model.AuditEvent;
import org.hl7.fhir.r4.model.Bundle;
import org.hl7.fhir.r4.model.Composition;
@ -16,17 +16,17 @@ import org.hl7.fhir.r4.model.DocumentReference;
import org.hl7.fhir.r4.model.MessageHeader;
import org.hl7.fhir.r4.model.Narrative;
import org.hl7.fhir.r4.model.Observation;
import org.hl7.fhir.r4.model.Parameters;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ca.uhn.fhir.context.FhirContext;
import com.google.common.base.Charsets;
import com.google.common.io.Resources;
import java.io.IOException;
import java.net.URL;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.test.BaseTest;
public class XmlParserR4Test extends BaseTest {
private static final Logger ourLog = LoggerFactory.getLogger(XmlParserR4Test.class);
@ -152,6 +152,31 @@ public class XmlParserR4Test extends BaseTest {
String auditEventAsString = ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(ae);
assertEquals(auditEvent, auditEventAsString);
}
/**
* Ensure that a xml:lang attribute is de- and reserialized correctly
*/
@Test
public void testDivXhtmlLangAttribute() {
String parameters = "<Parameters xmlns=\"http://hl7.org/fhir\">\n" +
" <parameter>\n" +
" <name value=\"resource\"/>\n" +
" <resource>\n" +
" <Patient xmlns=\"http://hl7.org/fhir\">\n" +
" <id value=\"example\"/>\n" +
" <language value=\"de\"/>\n" +
" <text>\n" +
" <status value=\"generated\"/>\n" +
" <div xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"de\" lang=\"de\">42 </div>\n" +
" </text>\n" +
" </Patient>\n" +
" </resource>\n" +
" </parameter>\n" +
"</Parameters>";
Parameters pa = ourCtx.newXmlParser().parseResource(Parameters.class, parameters);
String parameteresAsString = ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(pa);
assertEquals(parameters, parameteresAsString);
}