From b380a8f79773534b1bdf493848c5ad0c49c98d4d Mon Sep 17 00:00:00 2001 From: akley Date: Thu, 25 Sep 2014 10:36:29 +0200 Subject: [PATCH 1/6] Update PraserState.java Issue #26: XMLParser doesn't read Binary content from XML. Binary content is discarded during xml parsing, because attribute check of ID is missing in BinaryResourceState.attributeValue(...) --- .../src/main/java/ca/uhn/fhir/parser/ParserState.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java index dc8498b7fdc..87703646578 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java @@ -741,7 +741,13 @@ class ParserState { @Override public void attributeValue(String theName, String theValue) throws DataFormatException { - if ("contentType".equals(theName)) { + if ("id".equals(theName)) { + if (myInstance instanceof IIdentifiableElement) { + ((IIdentifiableElement) myInstance).setElementSpecificId((theValue)); + } else if (myInstance instanceof IResource) { + ((IResource) myInstance).setId(new IdDt(theValue)); + } + } else if ("contentType".equals(theName)) { myInstance.setContentType(theValue); } else if (myJsonMode && "value".equals(theName)) { string(theValue); From 4f4fdfd279450ca9b5579ed5c2b0c62781f8f978 Mon Sep 17 00:00:00 2001 From: James Agnew Date: Fri, 26 Sep 2014 09:23:03 -0400 Subject: [PATCH 2/6] Docs --- hapi-fhir-base/src/changes/changes.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hapi-fhir-base/src/changes/changes.xml b/hapi-fhir-base/src/changes/changes.xml index 461c6718f40..1bba66e94a7 100644 --- a/hapi-fhir-base/src/changes/changes.xml +++ b/hapi-fhir-base/src/changes/changes.xml @@ -55,6 +55,10 @@ entities converted to their equivalent unicode characters when resources are encoded, since FHIR does not allow extended entities in resource instances. + + Add a new client interceptor which adds HTTP Authorization Bearer Tokens (for use with OAUTH2 servers) + to client requests. + diff --git a/hapi-fhir-structures-dstu/pom.xml b/hapi-fhir-structures-dstu/pom.xml index dda39a0f878..9051879724d 100644 --- a/hapi-fhir-structures-dstu/pom.xml +++ b/hapi-fhir-structures-dstu/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.7-SNAPSHOT + 0.8-SNAPSHOT ../pom.xml @@ -18,7 +18,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.7-SNAPSHOT + 0.8-SNAPSHOT @@ -27,7 +27,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.7-SNAPSHOT + 0.8-SNAPSHOT diff --git a/hapi-fhir-testpage-overlay/pom.xml b/hapi-fhir-testpage-overlay/pom.xml index be8df6e6989..8b3e9d51b29 100644 --- a/hapi-fhir-testpage-overlay/pom.xml +++ b/hapi-fhir-testpage-overlay/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.7-SNAPSHOT + 0.8-SNAPSHOT ../pom.xml @@ -27,7 +27,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.7-SNAPSHOT + 0.8-SNAPSHOT org.thymeleaf @@ -50,7 +50,7 @@ ca.uhn.hapi.fhir hapi-fhir-jpaserver-test - 0.7-SNAPSHOT + 0.8-SNAPSHOT test diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml index 3142ebaf1f0..c5957777571 100644 --- a/hapi-tinder-plugin/pom.xml +++ b/hapi-tinder-plugin/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.7-SNAPSHOT + 0.8-SNAPSHOT ../pom.xml @@ -19,7 +19,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.7-SNAPSHOT + 0.8-SNAPSHOT diff --git a/hapi-tinder-test/pom.xml b/hapi-tinder-test/pom.xml index b03354f5be9..9c9aa371708 100644 --- a/hapi-tinder-test/pom.xml +++ b/hapi-tinder-test/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.7-SNAPSHOT + 0.8-SNAPSHOT ../pom.xml @@ -17,7 +17,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.7-SNAPSHOT + 0.8-SNAPSHOT @@ -40,7 +40,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.7-SNAPSHOT + 0.8-SNAPSHOT custom-structs diff --git a/pom.xml b/pom.xml index 588afded1c4..3517228b761 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ ca.uhn.hapi.fhir hapi-fhir pom - 0.7-SNAPSHOT + 0.8-SNAPSHOT HAPI-FHIR http://hl7api.sourceforge.net/hapi-fhir/ diff --git a/restful-server-example-test/pom.xml b/restful-server-example-test/pom.xml index 68e148fbc3e..8c0f105aa26 100644 --- a/restful-server-example-test/pom.xml +++ b/restful-server-example-test/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.7-SNAPSHOT + 0.8-SNAPSHOT ../pom.xml @@ -17,7 +17,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.7-SNAPSHOT + 0.8-SNAPSHOT ch.qos.logback diff --git a/restful-server-example/pom.xml b/restful-server-example/pom.xml index 6679bda8be1..c5fbb4baee4 100644 --- a/restful-server-example/pom.xml +++ b/restful-server-example/pom.xml @@ -13,7 +13,7 @@ ca.uhn.hapi.example restful-server-example - 0.7-SNAPSHOT + 0.8-SNAPSHOT war HAPI FHIR Sample RESTful Server @@ -34,14 +34,14 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.7-SNAPSHOT + 0.8-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 0.7-SNAPSHOT + 0.8-SNAPSHOT war provided