diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index 9ce273f031f..866c5f4c05f 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -398,6 +398,10 @@ + + com.sun.activation + javax.activation + javax.validation validation-api diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgDstu2Test.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgDstu2Test.java index 83b91ada0e0..63abe1ead90 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgDstu2Test.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgDstu2Test.java @@ -1016,42 +1016,6 @@ public class JsonParserHl7OrgDstu2Test { //@formatter:on } - /* - * Narrative generation is disabled for HL7org structs for now - */ - // @Test - public void testNarrativeGeneration() throws DataFormatException, IOException { - - Patient patient = new Patient(); - patient.addName().addFamily("Smith"); - Organization org = new Organization(); - patient.getManagingOrganization().setResource(org); - - INarrativeGenerator gen = new INarrativeGenerator() { - - @Override - public void generateNarrative(FhirContext theContext, IBaseResource theResource, INarrative theNarrative) { - try { - theNarrative.setDivAsString("
help
"); - } catch (Exception e) { - throw new Error(e); - } - theNarrative.setStatusAsString("generated"); - } - - }; - - FhirContext context = ourCtx; - context.setNarrativeGenerator(gen); - IParser p = context.newJsonParser(); - p.encodeResourceToWriter(patient, new OutputStreamWriter(System.out)); - String str = p.encodeResourceToString(patient); - - ourLog.info(str); - - assertThat(str, StringContains.containsString(",\"text\":{\"status\":\"generated\",\"div\":\"
help
\"},")); - } - @Test public void testNestedContainedResources() { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserHl7OrgDstu2Test.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserHl7OrgDstu2Test.java index c7a32847157..c8cbbc1b711 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserHl7OrgDstu2Test.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserHl7OrgDstu2Test.java @@ -1502,37 +1502,6 @@ public class XmlParserHl7OrgDstu2Test { "")); } - // Narrative generation not currently supported for HL7org structures - public void testNarrativeGeneration() throws DataFormatException, IOException { - - Patient patient = new Patient(); - patient.addName().addFamily("Smith"); - Organization org = new Organization(); - patient.getManagingOrganization().setResource(org); - - INarrativeGenerator gen = new INarrativeGenerator() { - - @Override - public void generateNarrative(FhirContext theContext, IBaseResource theResource, INarrative theNarrative) { - try { - theNarrative.setDivAsString("
help
"); - } catch (Exception e) { - throw new Error(e); - } - theNarrative.setStatusAsString("generated"); - } - - }; - - FhirContext context = ourCtx; - context.setNarrativeGenerator(gen); - IParser p = context.newXmlParser(); - String str = p.encodeResourceToString(patient); - - ourLog.info(str); - - assertThat(str, StringContains.containsString(",\"text\":{\"status\":\"generated\",\"div\":\"
help
\"},")); - } @Test public void testNestedContainedResources() { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/BinaryHl7OrgDstu2Test.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/BinaryHl7OrgDstu2Test.java index 9c8d392e86b..249613807c5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/BinaryHl7OrgDstu2Test.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/BinaryHl7OrgDstu2Test.java @@ -99,23 +99,6 @@ public class BinaryHl7OrgDstu2Test { } - public void testCreateWrongType() throws Exception { - Binary res = new Binary(); - res.setContent(new byte[] { 1, 2, 3, 4 }); - res.setContentType("text/plain"); - String stringContent = ourCtx.newJsonParser().encodeResourceToString(res); - - HttpPost http = new HttpPost("http://localhost:" + ourPort + "/Binary"); - http.setEntity(new StringEntity(stringContent, ContentType.create(Constants.CT_FHIR_JSON, "UTF-8"))); - - HttpResponse status = ourClient.execute(http); - assertEquals(201, status.getStatusLine().getStatusCode()); - - assertEquals("text/plain", ourLast.getContentType()); - assertArrayEquals(new byte[] { 1, 2, 3, 4 }, ourLast.getContent()); - - } - @Test public void testRead() throws Exception { HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Binary/foo"); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/IncludeHl7OrgDstu2Test.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/IncludeHl7OrgDstu2Test.java index b0339e5728c..1f8187af980 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/IncludeHl7OrgDstu2Test.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/IncludeHl7OrgDstu2Test.java @@ -95,20 +95,6 @@ public class IncludeHl7OrgDstu2Test { assertEquals("foo", p.getName().get(0).getFamily().get(0).getValue()); } - // @Test - public void testMixedContainedAndNonContained() throws Exception { - HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/DiagnosticReport?_query=stitchedInclude&_pretty=true"); - HttpResponse status = ourClient.execute(httpGet); - String responseContent = IOUtils.toString(status.getEntity().getContent()); - IOUtils.closeQuietly(status.getEntity().getContent()); - - ourLog.info(responseContent); - - assertEquals(200, status.getStatusLine().getStatusCode()); - Bundle bundle = ourCtx.newXmlParser().parseResource(Bundle.class, responseContent); - assertEquals(4, bundle.getEntry().size()); - } - @Test public void testIIncludedResourcesNonContained() throws Exception { HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient?_query=normalInclude&_pretty=true"); diff --git a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/IncludeTest.java b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/IncludeTest.java index 87c27d7362d..a821eda93b0 100644 --- a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/IncludeTest.java +++ b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/IncludeTest.java @@ -185,20 +185,6 @@ public class IncludeTest { } } - // @Test - public void testMixedContainedAndNonContained() throws Exception { - HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/DiagnosticReport?_query=stitchedInclude&_pretty=true"); - HttpResponse status = ourClient.execute(httpGet); - String responseContent = IOUtils.toString(status.getEntity().getContent()); - IOUtils.closeQuietly(status.getEntity().getContent()); - - ourLog.info(responseContent); - - assertEquals(200, status.getStatusLine().getStatusCode()); - Bundle bundle = ourCtx.newXmlParser().parseResource(Bundle.class, responseContent); - assertEquals(4, bundle.getEntry().size()); - } - @Test public void testNoIncludes() throws Exception { HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient?name=Hello"); diff --git a/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/QuestionnaireResponseValidatorDstu3Test.java b/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/QuestionnaireResponseValidatorDstu3Test.java index b3f987828de..190de326218 100644 --- a/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/QuestionnaireResponseValidatorDstu3Test.java +++ b/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/QuestionnaireResponseValidatorDstu3Test.java @@ -693,41 +693,6 @@ public class QuestionnaireResponseValidatorDstu3Test { assertThat(errors.toString(), containsString("LinkId \"link1\" not found in questionnaire")); } - // @Test - public void validateHealthConnexExample() throws Exception { - String input = IOUtils.toString(QuestionnaireResponseValidatorDstu3Test.class.getResourceAsStream("/questionnaireanswers-0f431c50ddbe4fff8e0dd6b7323625fc.xml")); - - QuestionnaireResponse qa = ourCtx.newXmlParser().parseResource(QuestionnaireResponse.class, input); - ValidationResult errors = myVal.validateWithResult(qa); - assertEquals(errors.toString(), 0, errors.getMessages().size()); - - /* - * Now change a coded value - */ - //@formatter:off - input = input.replaceAll( - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " ", - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " "); - assertThat(input, containsString("GGG")); - //@formatter:on - - qa = ourCtx.newXmlParser().parseResource(QuestionnaireResponse.class, input); - errors = myVal.validateWithResult(qa); - assertEquals(errors.toString(), 10, errors.getMessages().size()); - } - @AfterClass public static void afterClassClearContext() { myDefaultValidationSupport.flush(); diff --git a/pom.xml b/pom.xml index ff2dde0abd6..df9dc841959 100644 --- a/pom.xml +++ b/pom.xml @@ -493,13 +493,13 @@ 2.3.0 2.3.0 2.25.1 - 9.4.8.v20171121 + 9.4.10.v20180503 3.0.2 - 5.2.16.Final + 5.3.1.Final 5.4.1.Final - 5.7.1.Final + 5.10.1.Final 4.4.6 4.5.3 5.5.4 @@ -510,7 +510,7 @@ 9.1.1 9.5.1-5_1 1.2_5 - 5.0.3.RELEASE + 5.0.6.RELEASE 1.5.6.RELEASE 3.1.4 3.0.9.RELEASE @@ -625,6 +625,11 @@ okhttp 3.8.1 + + com.sun.activation + javax.activation + 1.2.0 + com.sun.mail javax.mail diff --git a/src/changes/changes.xml b/src/changes/changes.xml index d2a2bb8a867..1156a3d50fd 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -6,6 +6,20 @@ HAPI FHIR Changelog + + + The version of a few dependencies have been bumped to the + latest versions (dependent HAPI modules listed in brackets): + +
  • Spring Framework (JPA): 5.0.3.RELEASE -> 5.0.6.RELEASE
    • +
  • Hibernate OR (JPA): 5.2.16.Final -> 5.3.1.Final
    • +
  • Hibernate Search (JPA): 5.7.1.Final -> 5.10.1.Final
    • +
  • Jetty (CLI): 9.4.8.v20171121 -> 9.4.10.v20180503
    • + + ]]> +     +     The version of a few dependencies have been bumped to the