Finalize 1.0 release

hapifhir · May 8, 2015 · eeba581 · eeba581
1 parent e745094
commit eeba581
Show file tree

Hide file tree

Showing 20 changed files with 813 additions and 19 deletions.
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/TransactionParamBinder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/TransactionParamBinder.java
@@ -98,7 +98,9 @@ public void translateClientArgumentIntoQueryArgument(FhirContext theContext, Obj
 	@Override
 	public Object translateQueryParametersIntoServerArgument(Request theRequest, Object theRequestContents) throws InternalErrorException, InvalidRequestException {
 
-		EncodingEnum encoding = RestfulServerUtils.determineResponseEncodingWithDefault(theRequest.getServer(), theRequest.getServletRequest());
+		// TODO: don't use a default encoding, just fail!
+		EncodingEnum encoding = RestfulServerUtils.determineRequestEncoding(theRequest);
+
 		IParser parser = encoding.newParser(myContext);
 
 		BufferedReader reader;

diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderTest.java
@@ -45,6 +45,16 @@ public void testTransactionFromBundle() throws Exception {
 		ourLog.info(response);
 	}
 
+	// TODO: enable!
+//	@Test
+	public void testTransactionFromBundle3() throws Exception {
+
+		InputStream bundleRes = SystemProviderTest.class.getResourceAsStream("/grahame-transaction.xml");
+		String bundle = IOUtils.toString(bundleRes);
+		String response = ourClient.transaction().withBundle(bundle).prettyPrint().execute();
+		ourLog.info(response);
+	}
+
 	@Test
 	public void testTransactionFromBundle2() throws Exception {