");
@@ -107,6 +103,7 @@ public class JsonParserTest {
assertEquals(exp, act);
}
+
@Test
public void testDecimalPrecisionPreserved() {
String number = "52.3779939997090374535378485873776474764643249869328698436986235758587";
diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/RestfulClientFactoryDstu2Test.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/RestfulClientFactoryDstu2Test.java
new file mode 100644
index 00000000000..b01941bfa13
--- /dev/null
+++ b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/RestfulClientFactoryDstu2Test.java
@@ -0,0 +1,75 @@
+package ca.uhn.fhir.rest.client;
+
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+import java.util.Map;
+
+import org.junit.AfterClass;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.model.dstu2.resource.Conformance;
+import ca.uhn.fhir.parser.DataFormatException;
+import ca.uhn.fhir.rest.api.RequestTypeEnum;
+import ca.uhn.fhir.rest.client.apache.ApacheRestfulClientFactory;
+import ca.uhn.fhir.rest.client.api.IHttpClient;
+import ca.uhn.fhir.rest.client.api.IHttpRequest;
+import ca.uhn.fhir.rest.client.api.IHttpResponse;
+import ca.uhn.fhir.rest.server.EncodingEnum;
+import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
+import ca.uhn.fhir.util.TestUtil;
+
+public class RestfulClientFactoryDstu2Test {
+
+ private static FhirContext ourCtx = FhirContext.forDstu2();
+
+ /**
+ * See #518
+ */
+ @SuppressWarnings({ "unchecked", "cast" })
+ @Test
+ public void testMissingCapabilityStatementDstu2() throws Exception {
+ FhirContext ctx = mock(FhirContext.class);
+ IRestfulClientFactory restfulClientFactory = mock(IRestfulClientFactory.class);
+ IHttpClient httpClient = mock(IHttpClient.class);
+
+ when(ctx.getResourceDefinition(Mockito.eq("CapabilityStatement"))).thenThrow(new DataFormatException());
+ when(ctx.getResourceDefinition(Mockito.eq("Conformance"))).thenReturn(ourCtx.getResourceDefinition("Conformance"));
+ when(ctx.getResourceDefinition(Conformance.class)).thenReturn(ourCtx.getResourceDefinition("Conformance"));
+ when(ctx.getVersion()).thenReturn(FhirVersionEnum.DSTU2.getVersionImplementation());
+ when(ctx.getRestfulClientFactory()).thenReturn(restfulClientFactory);
+
+ when(restfulClientFactory.getHttpClient(any(StringBuilder.class), (Map
>)any(Map.class), any(String.class), any(RequestTypeEnum.class), any(List.class))).thenReturn(httpClient);
+
+ IHttpRequest httpRequest = mock(IHttpRequest.class);
+ when(httpClient.createGetRequest(any(FhirContext.class), any(EncodingEnum.class))).thenReturn(httpRequest);
+
+ IHttpResponse httpResponse = mock(IHttpResponse.class);
+ when(httpRequest.execute()).thenReturn(httpResponse);
+
+ when(httpResponse.getStatus()).thenReturn(404);
+
+ ApacheRestfulClientFactory cf = new ApacheRestfulClientFactory(ctx);
+ IHttpClient client = mock(IHttpClient.class);
+ BaseClient baseClient = mock(BaseClient.class);
+
+ try {
+ cf.validateServerBase("http://localhost:9999", client, baseClient);
+ fail();
+ } catch (ResourceNotFoundException e) {
+ // ok
+ }
+
+ }
+
+ @AfterClass
+ public static void afterClassClearContext() {
+ TestUtil.clearAllStaticFieldsForUnitTest();
+ }
+}
diff --git a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/JsonParserDstu3Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/JsonParserDstu3Test.java
index e67c190e0df..b70bcf2ce9e 100644
--- a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/JsonParserDstu3Test.java
+++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/JsonParserDstu3Test.java
@@ -1,5 +1,6 @@
package ca.uhn.fhir.parser;
+import static org.apache.commons.lang3.StringUtils.countMatches;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.empty;
@@ -17,7 +18,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.io.ObjectInputStream;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.util.*;
@@ -36,6 +39,7 @@ import org.hl7.fhir.dstu3.model.Enumeration;
import org.hl7.fhir.dstu3.model.Enumerations.AdministrativeGender;
import org.hl7.fhir.dstu3.model.Identifier.IdentifierUse;
import org.hl7.fhir.dstu3.model.Observation.ObservationStatus;
+import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.utilities.xhtml.XhtmlNode;
import org.junit.*;
import org.mockito.ArgumentCaptor;
@@ -66,6 +70,32 @@ public class JsonParserDstu3Test {
ourCtx.setNarrativeGenerator(null);
}
+ /**
+ * See #276
+ */
+ @Test
+ public void testDoubleEncodingContainedResources() throws Exception {
+ Patient patient = new Patient();
+ patient.setId("#patient-1");
+ patient.setActive(true);
+
+ Coverage coverage = new Coverage();
+ coverage.setId("#coverage-1");
+ coverage.getBeneficiary().setResource(patient);
+
+ Claim resource = new Claim();
+ resource.getContained().add(patient);
+ resource.getContained().add(coverage);
+ resource.getPatient().setReference("#patient-1");
+ resource.addCoverage().getCoverage().setReference("#coverage-1");
+
+ IParser p = ourCtx.newJsonParser().setPrettyPrint(true);
+ String encoded = p.encodeResourceToString(resource);
+ ourLog.info(encoded);
+
+ assertEquals(3, countMatches(encoded, "resourceType"));
+ }
+
/**
* #480
*/
@@ -77,15 +107,15 @@ public class JsonParserDstu3Test {
qr.getItemFirstRep().setLinkIdElement(new StringType());
qr.getItemFirstRep().addItem().setLinkIdElement(new StringType(""));
qr.getItemFirstRep().addItem().setLinkIdElement(new StringType("LINKID"));
-
+
String encoded = ourCtx.newJsonParser().encodeResourceToString(qr);
ourLog.info(encoded);
-
+
assertThat(encoded, stringContainsInOrder("123"));
assertThat(encoded, not(stringContainsInOrder("\"\"")));
assertThat(encoded, not(stringContainsInOrder("null")));
}
-
+
/**
* #480
*/
@@ -93,7 +123,7 @@ public class JsonParserDstu3Test {
public void testParseEmptyValue() {
String input = "{\"resourceType\":\"QuestionnaireResponse\",\"id\":\"123\",\"authored\":\"\",\"item\":[{\"item\":[{\"linkId\":\"\"}]}]}";
QuestionnaireResponse qr = ourCtx.newJsonParser().parseResource(QuestionnaireResponse.class, input);
-
+
assertEquals("QuestionnaireResponse/123", qr.getIdElement().getValue());
assertEquals(null, qr.getAuthored());
assertEquals(null, qr.getAuthoredElement().getValue());
@@ -108,7 +138,7 @@ public class JsonParserDstu3Test {
@Test
public void testUnexpectedElementsWithUnderscoreAtStartOfName() throws Exception {
String input = IOUtils.toString(JsonParserDstu3Test.class.getResourceAsStream("/bug477.json"), StandardCharsets.UTF_8);
-
+
IParserErrorHandler errorHandler = mock(IParserErrorHandler.class);
// Do it once without the custom error handler just for the logging
@@ -117,23 +147,22 @@ public class JsonParserDstu3Test {
p = ourCtx.newJsonParser();
p.setParserErrorHandler(errorHandler);
-
+
Patient parsed = p.parseResource(Patient.class, input);
assertEquals("1", parsed.getIdElement().getIdPart());
-
+
ArgumentCaptor elementName = ArgumentCaptor.forClass(String.class);
ArgumentCaptor expected = ArgumentCaptor.forClass(ValueType.class);
ArgumentCaptor actual = ArgumentCaptor.forClass(ValueType.class);
- verify(errorHandler, atLeastOnce()).incorrectJsonType(Mockito.any(IParseLocation.class),elementName.capture(), expected.capture(), actual.capture());
- verify(errorHandler, atLeastOnce()).incorrectJsonType(Mockito.any(IParseLocation.class),Mockito.eq("_id"), Mockito.eq(ValueType.OBJECT), Mockito.eq(ValueType.SCALAR));
- verify(errorHandler, atLeastOnce()).incorrectJsonType(Mockito.any(IParseLocation.class),Mockito.eq("__v"), Mockito.eq(ValueType.OBJECT), Mockito.eq(ValueType.SCALAR));
- verify(errorHandler, atLeastOnce()).incorrectJsonType(Mockito.any(IParseLocation.class),Mockito.eq("_status"), Mockito.eq(ValueType.OBJECT), Mockito.eq(ValueType.SCALAR));
-
+ verify(errorHandler, atLeastOnce()).incorrectJsonType(Mockito.any(IParseLocation.class), elementName.capture(), expected.capture(), actual.capture());
+ verify(errorHandler, atLeastOnce()).incorrectJsonType(Mockito.any(IParseLocation.class), Mockito.eq("_id"), Mockito.eq(ValueType.OBJECT), Mockito.eq(ValueType.SCALAR));
+ verify(errorHandler, atLeastOnce()).incorrectJsonType(Mockito.any(IParseLocation.class), Mockito.eq("__v"), Mockito.eq(ValueType.OBJECT), Mockito.eq(ValueType.SCALAR));
+ verify(errorHandler, atLeastOnce()).incorrectJsonType(Mockito.any(IParseLocation.class), Mockito.eq("_status"), Mockito.eq(ValueType.OBJECT), Mockito.eq(ValueType.SCALAR));
+
assertEquals("_id", elementName.getAllValues().get(0));
assertEquals(ValueType.OBJECT, expected.getAllValues().get(0));
assertEquals(ValueType.SCALAR, actual.getAllValues().get(0));
}
-
@Test
public void testEncodeAndParseExtensions() throws Exception {
@@ -221,7 +250,6 @@ public class JsonParserDstu3Test {
}
-
@Test
public void testEncodeAndParseMetaProfileAndTags() {
Patient p = new Patient();
@@ -300,7 +328,6 @@ public class JsonParserDstu3Test {
assertEquals("sec_label2", tagList.get(1).getDisplay());
}
-
/**
* See #336
*/
@@ -355,7 +382,6 @@ public class JsonParserDstu3Test {
}
-
@Test
public void testEncodeAndParseSecurityLabels() {
Patient p = new Patient();
@@ -415,7 +441,7 @@ public class JsonParserDstu3Test {
assertEquals("DISPLAY2", label.getDisplay());
assertEquals("VERSION2", label.getVersion());
}
-
+
@Test
public void testEncodeBundleNewBundleNoText() {
@@ -434,8 +460,6 @@ public class JsonParserDstu3Test {
}
-
-
/**
* See #326
*/
@@ -481,7 +505,7 @@ public class JsonParserDstu3Test {
String actual = ourCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(p);
assertThat(actual, not(containsString("78ef6f64c2f2")));
}
-
+
@Test
public void testEncodeEmptyBinary() {
String output = ourCtx.newJsonParser().encodeResourceToString(new Binary());
@@ -503,8 +527,7 @@ public class JsonParserDstu3Test {
String encoded = ourCtx.newJsonParser().encodeResourceToString(p);
assertThat(encoded, not(containsString("tag")));
}
-
-
+
/**
* #158
*/
@@ -697,14 +720,14 @@ public class JsonParserDstu3Test {
@Test
public void testEncodeHistoryEncodeVersionsAtPath1() {
ourCtx = FhirContext.forDstu3();
-
+
assertNull(ourCtx.newJsonParser().getStripVersionsFromReferences());
-
+
Patient p = new Patient();
p.setManagingOrganization(new Reference("http://foo.com/Organization/2/_history/1"));
-
+
IParser parser = ourCtx.newJsonParser();
-
+
parser.setDontStripVersionsFromReferencesAtPaths("Patient.managingOrganization");
String enc = parser.setPrettyPrint(true).encodeResourceToString(p);
ourLog.info(enc);
@@ -714,15 +737,15 @@ public class JsonParserDstu3Test {
@Test
public void testEncodeHistoryEncodeVersionsAtPath2() {
ourCtx = FhirContext.forDstu3();
-
+
assertNull(ourCtx.newJsonParser().getStripVersionsFromReferences());
assertTrue(ourCtx.getParserOptions().isStripVersionsFromReferences());
-
+
Patient p = new Patient();
p.setManagingOrganization(new Reference("http://foo.com/Organization/2/_history/1"));
-
+
IParser parser = ourCtx.newJsonParser();
-
+
parser.setDontStripVersionsFromReferencesAtPaths("AuditEvent.entity.reference");
String enc = parser.setPrettyPrint(true).encodeResourceToString(p);
ourLog.info(enc);
@@ -732,30 +755,30 @@ public class JsonParserDstu3Test {
@Test
public void testEncodeHistoryEncodeVersionsAtPath3() {
ourCtx = FhirContext.forDstu3();
-
+
assertNull(ourCtx.newJsonParser().getStripVersionsFromReferences());
-
+
AuditEvent auditEvent = new AuditEvent();
auditEvent.addEntity().setReference(new Reference("http://foo.com/Organization/2/_history/1"));
-
+
IParser parser = ourCtx.newJsonParser();
-
+
parser.setDontStripVersionsFromReferencesAtPaths("AuditEvent.entity.reference");
String enc = parser.setPrettyPrint(true).encodeResourceToString(auditEvent);
ourLog.info(enc);
assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2/_history/1\""));
-
+
parser.setDontStripVersionsFromReferencesAtPaths(new ArrayList());
enc = parser.setPrettyPrint(true).encodeResourceToString(auditEvent);
ourLog.info(enc);
assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2\""));
- parser.setDontStripVersionsFromReferencesAtPaths((String[])null);
+ parser.setDontStripVersionsFromReferencesAtPaths((String[]) null);
enc = parser.setPrettyPrint(true).encodeResourceToString(auditEvent);
ourLog.info(enc);
assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2\""));
- parser.setDontStripVersionsFromReferencesAtPaths((List)null);
+ parser.setDontStripVersionsFromReferencesAtPaths((List) null);
enc = parser.setPrettyPrint(true).encodeResourceToString(auditEvent);
ourLog.info(enc);
assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2\""));
@@ -764,21 +787,21 @@ public class JsonParserDstu3Test {
@Test
public void testEncodeHistoryEncodeVersionsAtPathUsingOptions() {
ourCtx = FhirContext.forDstu3();
-
+
assertNull(ourCtx.newJsonParser().getStripVersionsFromReferences());
assertTrue(ourCtx.getParserOptions().isStripVersionsFromReferences());
assertThat(ourCtx.getParserOptions().getDontStripVersionsFromReferencesAtPaths(), empty());
-
+
Patient p = new Patient();
p.setManagingOrganization(new Reference("http://foo.com/Organization/2/_history/1"));
-
+
IParser parser = ourCtx.newJsonParser();
-
+
ourCtx.getParserOptions().setDontStripVersionsFromReferencesAtPaths("Patient.managingOrganization");
String enc = parser.setPrettyPrint(true).encodeResourceToString(p);
ourLog.info(enc);
assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2/_history/1\""));
-
+
ourCtx.getParserOptions().setDontStripVersionsFromReferencesAtPaths(Arrays.asList("Patient.managingOrganization"));
enc = parser.setPrettyPrint(true).encodeResourceToString(p);
ourLog.info(enc);
@@ -793,17 +816,17 @@ public class JsonParserDstu3Test {
@Test
public void testEncodeHistoryStripVersionsFromReferences() {
ourCtx = FhirContext.forDstu3();
-
+
assertNull(ourCtx.newJsonParser().getStripVersionsFromReferences());
-
+
Patient p = new Patient();
p.setManagingOrganization(new Reference("http://foo.com/Organization/2/_history/1"));
-
+
IParser parser = ourCtx.newJsonParser();
String enc = parser.setPrettyPrint(true).encodeResourceToString(p);
ourLog.info(enc);
assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2\""));
-
+
parser.setStripVersionsFromReferences(false);
enc = parser.setPrettyPrint(true).encodeResourceToString(p);
ourLog.info(enc);
@@ -815,17 +838,17 @@ public class JsonParserDstu3Test {
@Test
public void testEncodeHistoryStripVersionsFromReferencesFromContext() {
ourCtx = FhirContext.forDstu3();
-
+
assertTrue(ourCtx.getParserOptions().isStripVersionsFromReferences());
-
+
Patient p = new Patient();
p.setManagingOrganization(new Reference("http://foo.com/Organization/2/_history/1"));
-
+
IParser parser = ourCtx.newJsonParser();
String enc = parser.setPrettyPrint(true).encodeResourceToString(p);
ourLog.info(enc);
assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2\""));
-
+
ourCtx.getParserOptions().setStripVersionsFromReferences(false);
enc = parser.setPrettyPrint(true).encodeResourceToString(p);
ourLog.info(enc);
@@ -1015,7 +1038,7 @@ public class JsonParserDstu3Test {
assertEquals("home", ref.getValue().toCode());
}
-
+
@Test
public void testEncodeWithDontEncodeElements() throws Exception {
Patient patient = new Patient();
@@ -1645,7 +1668,7 @@ public class JsonParserDstu3Test {
} catch (DataFormatException e) {
assertEquals("Resource is missing required element 'url' in parent element 'extension'", e.getMessage());
}
-
+
}
/**
@@ -1675,7 +1698,7 @@ public class JsonParserDstu3Test {
} catch (DataFormatException e) {
assertEquals("Resource is missing required element 'url' in parent element 'modifierExtension'", e.getMessage());
}
-
+
}
@Test
@@ -1744,15 +1767,14 @@ public class JsonParserDstu3Test {
@Test
public void testParseMissingArray() throws IOException {
// RelatedPerson.name is 0..* but this file has it as a 0..1 (no array around the object)
-
+
// We're lenient so we accept it. Maybe this could change, or be a warning in future though
-
+
String input = IOUtils.toString(JsonParserDstu3Test.class.getResourceAsStream("/missing_array.json"), StandardCharsets.UTF_8);
RelatedPerson rp = ourCtx.newJsonParser().parseResource(RelatedPerson.class, input);
assertEquals(1, rp.getName().size());
assertEquals("Doe", rp.getName().get(0).getFamilyAsSingleString());
-
-
+
}
/**
@@ -1763,7 +1785,7 @@ public class JsonParserDstu3Test {
String input = "{\"resourceType\":\"Basic\",\"id\":\"1\",\"text\":{\"status\":\"generated\",\"div\":\"\"}}";
Basic basic = ourCtx.newJsonParser().parseResource(Basic.class, input);
assertEquals(null, basic.getText().getDivAsString());
-
+
input = "{\"resourceType\":\"Basic\",\"id\":\"1\",\"text\":{\"status\":\"generated\",\"div\":\"\"}}";
basic = ourCtx.newJsonParser().parseResource(Basic.class, input);
assertEquals(null, basic.getText().getDivAsString());
@@ -1938,7 +1960,7 @@ public class JsonParserDstu3Test {
@Test
public void testValidateCustomStructure() throws Exception {
-
+
FooMessageHeader.FooMessageSourceComponent source = new FooMessageHeader.FooMessageSourceComponent();
source.getMessageHeaderApplicationId().setValue("APPID");
source.setName("NAME");
@@ -1952,9 +1974,9 @@ public class JsonParserDstu3Test {
FhirValidator val = ourCtx.newValidator();
val.setValidateAgainstStandardSchema(true);
val.setValidateAgainstStandardSchematron(true);
-
+
ValidationResult result = val.validateWithResult(header);
-
+
ourLog.info(ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(result.toOperationOutcome()));
assertTrue(result.isSuccessful());
}
diff --git a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/client/RestfulClientFactoryTest.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/client/RestfulClientFactoryTest.java
new file mode 100644
index 00000000000..87e36b7d6c8
--- /dev/null
+++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/client/RestfulClientFactoryTest.java
@@ -0,0 +1,76 @@
+package ca.uhn.fhir.rest.client;
+
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+import java.util.Map;
+
+import org.hl7.fhir.dstu3.model.Conformance;
+import org.junit.AfterClass;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.parser.DataFormatException;
+import ca.uhn.fhir.rest.api.RequestTypeEnum;
+import ca.uhn.fhir.rest.client.apache.ApacheRestfulClientFactory;
+import ca.uhn.fhir.rest.client.api.IHttpClient;
+import ca.uhn.fhir.rest.client.api.IHttpRequest;
+import ca.uhn.fhir.rest.client.api.IHttpResponse;
+import ca.uhn.fhir.rest.server.EncodingEnum;
+import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
+import ca.uhn.fhir.util.TestUtil;
+
+@SuppressWarnings("deprecation")
+public class RestfulClientFactoryTest {
+
+ private static FhirContext ourCtx = FhirContext.forDstu3();
+
+ /**
+ * See #518
+ */
+ @SuppressWarnings({ "unchecked", "cast" })
+ @Test
+ public void testMissingCapabilityStatement() throws Exception {
+ FhirContext ctx = mock(FhirContext.class);
+ IRestfulClientFactory restfulClientFactory = mock(IRestfulClientFactory.class);
+ IHttpClient httpClient = mock(IHttpClient.class);
+
+ when(ctx.getResourceDefinition(Mockito.eq("CapabilityStatement"))).thenThrow(new DataFormatException());
+ when(ctx.getResourceDefinition(Mockito.eq("Conformance"))).thenReturn(ourCtx.getResourceDefinition("Conformance"));
+ when(ctx.getResourceDefinition(Conformance.class)).thenReturn(ourCtx.getResourceDefinition("Conformance"));
+ when(ctx.getVersion()).thenReturn(FhirVersionEnum.DSTU3.getVersionImplementation());
+ when(ctx.getRestfulClientFactory()).thenReturn(restfulClientFactory);
+
+ when(restfulClientFactory.getHttpClient(any(StringBuilder.class), (Map>)any(Map.class), any(String.class), any(RequestTypeEnum.class), any(List.class))).thenReturn(httpClient);
+
+ IHttpRequest httpRequest = mock(IHttpRequest.class);
+ when(httpClient.createGetRequest(any(FhirContext.class), any(EncodingEnum.class))).thenReturn(httpRequest);
+
+ IHttpResponse httpResponse = mock(IHttpResponse.class);
+ when(httpRequest.execute()).thenReturn(httpResponse);
+
+ when(httpResponse.getStatus()).thenReturn(404);
+
+ ApacheRestfulClientFactory cf = new ApacheRestfulClientFactory(ctx);
+ IHttpClient client = mock(IHttpClient.class);
+ BaseClient baseClient = mock(BaseClient.class);
+
+ try {
+ cf.validateServerBase("http://localhost:9999", client, baseClient);
+ fail();
+ } catch (ResourceNotFoundException e) {
+ // ok
+ }
+
+ }
+
+ @AfterClass
+ public static void afterClassClearContext() {
+ TestUtil.clearAllStaticFieldsForUnitTest();
+ }
+}
diff --git a/pom.xml b/pom.xml
index 3f7b8f58f2c..2565b52e4a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -274,6 +274,11 @@
vadi2
Vadim Peretokin
+
+ lawley
+ Michael Lawley
+ CSIRO
+
@@ -307,7 +312,7 @@
2.4
2.7.1
4.4.5
- 4.3.1.RELEASE
+ 4.3.4.RELEASE
3.0.1.RELEASE
1.6
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2675db22047..552e3c154b4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -7,7 +7,16 @@
-
+
+ Bump the version of a few dependencies to the
+ latest versions (dependent HAPI modules listed in brackets):
+
+ spring (JPA): 4.3.1 -> 4.3.4
+
+ ]]>
+
+
Fix issue in AuthorizationIntetceptor where
transactions are blocked even when they
should not be
@@ -46,6 +55,26 @@
or log a warning depending on the configured
error handler.
+
+ Fix issue when serializing resources that have
+ contained resources which are referred to
+ from multiple places. Sometimes when serializing
+ these resources the contained resource section
+ would contain duplicates. Thanks to Hugo Soares
+ and Stefan Evinance for reporting and providing
+ a test case!
+
+
+ Allow client to gracefully handle running in DSTU3 mode
+ but with a structures JAR that does not contain a
+ CapabilityStatement resource. Thanks to Michael Lawley
+ for the pull request!
+
+
+ Fix a crash in JPA server when searching using an _include if _include targets are
+ external references (and therefore can't be loaded
+ by the server). Thanks to Hannes Ulrich for reporting!
+