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

Support attributes longer than 512kb.

This commit is contained in:
James Agnew 2015-06-04 12:19:10 -04:00
parent 9b97fb0e97
commit 62b0707b36
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlUtil.java
View File

@ -221,6 +221,7 @@ public class XmlUtil {
if (inputFactory instanceof com.ctc.wstx.stax.WstxInputFactory) { if (inputFactory instanceof com.ctc.wstx.stax.WstxInputFactory) {
// inputFactory.setProperty(WstxInputFactory.IS_REPLACING_ENTITY_REFERENCES, false); // inputFactory.setProperty(WstxInputFactory.IS_REPLACING_ENTITY_REFERENCES, false);
inputFactory.setProperty(WstxInputProperties.P_UNDECLARED_ENTITY_RESOLVER, XML_RESOLVER); inputFactory.setProperty(WstxInputProperties.P_UNDECLARED_ENTITY_RESOLVER, XML_RESOLVER);
inputFactory.setProperty(WstxInputProperties.P_MAX_ATTRIBUTE_SIZE, "100000000");
} }
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
ourLog.debug("WstxOutputFactory (Woodstox) not found on classpath"); ourLog.debug("WstxOutputFactory (Woodstox) not found on classpath");

2
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2Test.java
View File

@ -958,7 +958,7 @@ public class ResourceProviderDstu2Test {
} }
} }
// @Test @Test
public void testValidateResourceHuge() throws IOException { public void testValidateResourceHuge() throws IOException {
Patient patient = new Patient(); Patient patient = new Patient();

4
hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/parser/XmlParserTest.java
View File

@ -118,7 +118,7 @@ public class XmlParserTest {
} }
// @Test @Test
public void testParseAndEncodeHugeValue() { public void testParseAndEncodeHugeValue() {
int len = 1000000; int len = 1000000;
byte[] bytes = new byte[len]; byte[] bytes = new byte[len];
@ -137,7 +137,7 @@ public class XmlParserTest {
obs = ourCtx.newXmlParser().parseResource(Observation.class, str); obs = ourCtx.newXmlParser().parseResource(Observation.class, str);
att = (AttachmentDt) obs.getValue(); att = (AttachmentDt) obs.getValue();
assertEquals(bytes, att.getData().getValue()); assertArrayEquals(bytes, att.getData().getValue());
} }

2
hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/validation/ResourceValidatorDstu2Test.java
View File

@ -66,7 +66,7 @@ public class ResourceValidatorDstu2Test {
ourLog.info(resultString); ourLog.info(resultString);
assertEquals(2, result.getOperationOutcome().getIssue().size()); assertEquals(2, result.getOperationOutcome().getIssue().size());
assertThat(resultString, StringContains.containsString("'2000-15-31'")); assertThat(resultString, StringContains.containsString("2000-15-31"));
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")

1
hapi-fhir-structures-hl7org-dstu2/tmp.txt
View File

File diff suppressed because one or more lines are too long

6
src/changes/changes.xml
View File

@ -58,6 +58,12 @@
<action type="add"> <action type="add">
LoggingInterceptor for server now supports logging DSTU2 extended operations by name LoggingInterceptor for server now supports logging DSTU2 extended operations by name
</action> </action>
<action type="fix">
Woodstox XML parser has a default setting to limit the maximum
length of an attribute to 512kb. This caused issues handling
large attachments, so this setting has been increased to 100Mb.
Thanks to Nikos Kyriakoulakos for reporting!
</action>
</release> </release>
<release version="1.0" date="2015-May-8"> <release version="1.0" date="2015-May-8">
<action type="add"> <action type="add">