From 9f9aeb980c2fae230dfb63887f76884ae0b93bdd Mon Sep 17 00:00:00 2001 From: dotasek Date: Tue, 19 Sep 2023 14:26:20 -0400 Subject: [PATCH] Bump core version to 6.1.2 (#5317) * WIP Fix compile errors * Fix compile errors 2 * Fix test fails due to new Validation messages * Ignore validation issues Ignore two validation issues: Two 'side is inherently a collection' warnings are now thrown for the following expressions: NamingSystem nsd-1 uniqueId.type = 'uuid' Observation obs-7 code != component.code There is also a general error ignored because the StructureDefinition for StructureDefinition is actually for FHIR 3.0.1, and contains an invalid expression in constraint sdf-9. This is remedied in the expression used in 3.0.2, but a full update of all profile structure definitions is out of scope for this PR. * Fix property name * Add changelog --- .../uhn/hapi/fhir/changelog/7_0_0/changes.yaml | 3 +++ hapi-fhir-jpaserver-model/pom.xml | 14 +++----------- .../extractor/SearchParamExtractorR4.java | 1 + .../extractor/SearchParamExtractorR4B.java | 1 + .../extractor/SearchParamExtractorR5.java | 1 + hapi-fhir-server-mdm/pom.xml | 13 ++----------- hapi-fhir-storage-cr/pom.xml | 16 +++------------- .../jpa/validation/ValidatorResourceFetcher.java | 3 ++- hapi-fhir-structures-dstu3/pom.xml | 2 +- .../dstu3/hapi/fluentpath/FhirPathDstu3.java | 1 + hapi-fhir-structures-hl7org-dstu2/pom.xml | 2 +- hapi-fhir-structures-r4/pom.xml | 2 +- .../hl7/fhir/r4/hapi/fluentpath/FhirPathR4.java | 1 + hapi-fhir-structures-r4b/pom.xml | 2 +- .../hl7/fhir/r4b/hapi/fhirpath/FhirPathR4B.java | 1 + hapi-fhir-structures-r5/pom.xml | 2 +- .../hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java | 6 ++++++ .../hl7/fhir/r5/hapi/fhirpath/FhirPathR5.java | 1 + hapi-fhir-validation/pom.xml | 16 ++-------------- .../validator/FhirInstanceValidator.java | 1 + .../VersionSpecificWorkerContextWrapper.java | 7 +++++++ .../FhirInstanceValidatorDstu3Test.java | 9 ++++++--- .../validation/FhirInstanceValidatorR4Test.java | 5 +++-- .../validation/FhirInstanceValidatorR4BTest.java | 7 ++++--- .../validation/FhirInstanceValidatorR5Test.java | 2 +- pom.xml | 16 +++++----------- 26 files changed, 60 insertions(+), 75 deletions(-) diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_0_0/changes.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_0_0/changes.yaml index 9d358db4943..86eb2ac6c22 100644 --- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_0_0/changes.yaml +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_0_0/changes.yaml @@ -9,4 +9,7 @@
  • Logback (All): 1.4.4 -> 1.4.7
  • H2 Database (JPA): 2.1.214 -> 2.2.220
  • Thymeleaf (Testpage Overlay): 3.0.14.RELEASE -> 3.1.2.RELEASE
    • +
  • xpp3 (All): 1.1.4c.0 -> 1.1.6
    • +
  • HtmlUnit (All): 2.67.0 -> 2.70.0
    • +
  • org.hl7.fhir.core (All): 6.0.22.2 -> 6.1.2
    • " diff --git a/hapi-fhir-jpaserver-model/pom.xml b/hapi-fhir-jpaserver-model/pom.xml index a724c6bebcd..69ccc6d35b9 100644 --- a/hapi-fhir-jpaserver-model/pom.xml +++ b/hapi-fhir-jpaserver-model/pom.xml @@ -26,21 +26,13 @@ junit junit - - - xpp3 - xpp3 - + + - - - org.codelibs - xpp3 - 1.1.4c.0 - + ca.uhn.hapi.fhir diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4.java index 32a22686730..6b22d38b625 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4.java @@ -39,6 +39,7 @@ import org.hl7.fhir.r4.model.ResourceType; import org.hl7.fhir.r4.model.TypeDetails; import org.hl7.fhir.r4.model.ValueSet; import org.hl7.fhir.r4.utils.FHIRPathEngine; +import org.hl7.fhir.r4.utils.FHIRPathUtilityClasses.FunctionDetails; import java.util.Collections; import java.util.HashMap; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4B.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4B.java index 749df636d95..6ff518529a4 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4B.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4B.java @@ -39,6 +39,7 @@ import org.hl7.fhir.r4b.model.ResourceType; import org.hl7.fhir.r4b.model.TypeDetails; import org.hl7.fhir.r4b.model.ValueSet; import org.hl7.fhir.r4b.utils.FHIRPathEngine; +import org.hl7.fhir.r4b.utils.FHIRPathUtilityClasses.FunctionDetails; import java.util.Collections; import java.util.HashMap; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR5.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR5.java index 142432415f1..05ae9608475 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR5.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR5.java @@ -38,6 +38,7 @@ import org.hl7.fhir.r5.model.ResourceType; import org.hl7.fhir.r5.model.TypeDetails; import org.hl7.fhir.r5.model.ValueSet; import org.hl7.fhir.r5.utils.FHIRPathEngine; +import org.hl7.fhir.r5.utils.FHIRPathUtilityClasses.FunctionDetails; import java.util.Collections; import java.util.HashMap; diff --git a/hapi-fhir-server-mdm/pom.xml b/hapi-fhir-server-mdm/pom.xml index 7b6e763b18e..cdc1028078b 100644 --- a/hapi-fhir-server-mdm/pom.xml +++ b/hapi-fhir-server-mdm/pom.xml @@ -60,20 +60,11 @@ junit junit - - - xpp3 - xpp3 - + - - - org.codelibs - xpp3 - 1.1.4c.0 - + com.fasterxml.jackson.core diff --git a/hapi-fhir-storage-cr/pom.xml b/hapi-fhir-storage-cr/pom.xml index e1b375c2d43..0294daede02 100644 --- a/hapi-fhir-storage-cr/pom.xml +++ b/hapi-fhir-storage-cr/pom.xml @@ -19,7 +19,7 @@ 4.10.1 - 1.1.4c.0 + 1.1.6 5.7.8 @@ -40,16 +40,6 @@ ca.uhn.hapi.fhir hapi-fhir-validation ${project.version} - - - xpp3 - xpp3_min - - - xmlpull - xmlpull - - ca.uhn.hapi.fhir @@ -169,9 +159,9 @@ - org.codelibs + org.ogce xpp3 - ${org.codelibs.xpp3-version} + ${xpp3-version} diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidatorResourceFetcher.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidatorResourceFetcher.java index 037f43698bd..d7fc7b40ab7 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidatorResourceFetcher.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/validation/ValidatorResourceFetcher.java @@ -86,7 +86,8 @@ public class ValidatorResourceFetcher implements IValidatorResourceFetcher { } @Override - public boolean resolveURL(IResourceValidator iResourceValidator, Object o, String s, String s1, String s2) + public boolean resolveURL( + IResourceValidator iResourceValidator, Object o, String s, String s1, String s2, boolean isCanonical) throws IOException, FHIRException { return true; } diff --git a/hapi-fhir-structures-dstu3/pom.xml b/hapi-fhir-structures-dstu3/pom.xml index 83d18205f1c..cb71abc603f 100644 --- a/hapi-fhir-structures-dstu3/pom.xml +++ b/hapi-fhir-structures-dstu3/pom.xml @@ -176,7 +176,7 @@ true - xpp3 + org.ogce xpp3 true diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/fluentpath/FhirPathDstu3.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/fluentpath/FhirPathDstu3.java index 9cb7278e2be..076481df481 100644 --- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/fluentpath/FhirPathDstu3.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/fluentpath/FhirPathDstu3.java @@ -12,6 +12,7 @@ import org.hl7.fhir.dstu3.model.ExpressionNode; import org.hl7.fhir.dstu3.model.IdType; import org.hl7.fhir.dstu3.model.TypeDetails; import org.hl7.fhir.dstu3.utils.FHIRPathEngine; +import org.hl7.fhir.dstu3.utils.FHIRPathUtilityClasses.FunctionDetails; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.PathEngineException; import org.hl7.fhir.instance.model.api.IBase; diff --git a/hapi-fhir-structures-hl7org-dstu2/pom.xml b/hapi-fhir-structures-hl7org-dstu2/pom.xml index bf1ab0c9c87..39d82b32538 100644 --- a/hapi-fhir-structures-hl7org-dstu2/pom.xml +++ b/hapi-fhir-structures-hl7org-dstu2/pom.xml @@ -71,7 +71,7 @@ - xpp3 + org.ogce xpp3 true diff --git a/hapi-fhir-structures-r4/pom.xml b/hapi-fhir-structures-r4/pom.xml index 1d2311afaaa..75529b0b3e6 100644 --- a/hapi-fhir-structures-r4/pom.xml +++ b/hapi-fhir-structures-r4/pom.xml @@ -78,7 +78,7 @@ true - xpp3 + org.ogce xpp3 true diff --git a/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/fluentpath/FhirPathR4.java b/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/fluentpath/FhirPathR4.java index c8c27d02a28..9b867892b7f 100644 --- a/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/fluentpath/FhirPathR4.java +++ b/hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/fluentpath/FhirPathR4.java @@ -16,6 +16,7 @@ import org.hl7.fhir.r4.model.IdType; import org.hl7.fhir.r4.model.TypeDetails; import org.hl7.fhir.r4.model.ValueSet; import org.hl7.fhir.r4.utils.FHIRPathEngine; +import org.hl7.fhir.r4.utils.FHIRPathUtilityClasses.FunctionDetails; import java.util.List; import java.util.Optional; diff --git a/hapi-fhir-structures-r4b/pom.xml b/hapi-fhir-structures-r4b/pom.xml index 6a9896c2d27..b3849d43628 100644 --- a/hapi-fhir-structures-r4b/pom.xml +++ b/hapi-fhir-structures-r4b/pom.xml @@ -70,7 +70,7 @@ true - xpp3 + org.ogce xpp3 true diff --git a/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/fhirpath/FhirPathR4B.java b/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/fhirpath/FhirPathR4B.java index 78cc8cbc1e4..04eb7422c45 100644 --- a/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/fhirpath/FhirPathR4B.java +++ b/hapi-fhir-structures-r4b/src/main/java/org/hl7/fhir/r4b/hapi/fhirpath/FhirPathR4B.java @@ -16,6 +16,7 @@ import org.hl7.fhir.r4b.model.IdType; import org.hl7.fhir.r4b.model.TypeDetails; import org.hl7.fhir.r4b.model.ValueSet; import org.hl7.fhir.r4b.utils.FHIRPathEngine; +import org.hl7.fhir.r4b.utils.FHIRPathUtilityClasses.FunctionDetails; import java.util.List; import java.util.Optional; diff --git a/hapi-fhir-structures-r5/pom.xml b/hapi-fhir-structures-r5/pom.xml index 1af7a34ad04..e3277c5fc93 100644 --- a/hapi-fhir-structures-r5/pom.xml +++ b/hapi-fhir-structures-r5/pom.xml @@ -67,7 +67,7 @@ true - xpp3 + org.ogce xpp3 true diff --git a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java index af2de2a7487..8346eec71c3 100644 --- a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java +++ b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java @@ -162,6 +162,12 @@ public final class HapiWorkerContext extends I18nBase implements IWorkerContext throw new UnsupportedOperationException(Msg.code(209)); } + @Override + public void validateCodeBatchByRef( + ValidationOptions validationOptions, List list, String s) { + throw new UnsupportedOperationException(Msg.code(2430)); + } + @Override public ValueSetExpansionOutcome expandVS( ValueSet theValueSet, boolean cacheOk, boolean heiarchical, boolean incompleteOk) { diff --git a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/fhirpath/FhirPathR5.java b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/fhirpath/FhirPathR5.java index eb5d3124b9c..c8cdbf8062f 100644 --- a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/fhirpath/FhirPathR5.java +++ b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/fhirpath/FhirPathR5.java @@ -16,6 +16,7 @@ import org.hl7.fhir.r5.model.IdType; import org.hl7.fhir.r5.model.TypeDetails; import org.hl7.fhir.r5.model.ValueSet; import org.hl7.fhir.r5.utils.FHIRPathEngine; +import org.hl7.fhir.r5.utils.FHIRPathUtilityClasses.FunctionDetails; import java.util.List; import java.util.Optional; diff --git a/hapi-fhir-validation/pom.xml b/hapi-fhir-validation/pom.xml index c7123aee26d..c361ce18cbe 100644 --- a/hapi-fhir-validation/pom.xml +++ b/hapi-fhir-validation/pom.xml @@ -79,19 +79,11 @@ org.apache.commons commons-collections4 - - xpp3 - xpp3 - + - - - org.codelibs - xpp3 - 1.1.4c.0 - + ca.uhn.hapi.fhir @@ -103,10 +95,6 @@ org.fhir ucum - - xpp3 - xpp3 - junit junit diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/FhirInstanceValidator.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/FhirInstanceValidator.java index b1e76206df0..89795f8096c 100644 --- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/FhirInstanceValidator.java +++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/FhirInstanceValidator.java @@ -13,6 +13,7 @@ import org.hl7.fhir.r5.model.Base; import org.hl7.fhir.r5.model.TypeDetails; import org.hl7.fhir.r5.model.ValueSet; import org.hl7.fhir.r5.utils.FHIRPathEngine; +import org.hl7.fhir.r5.utils.FHIRPathUtilityClasses.FunctionDetails; import org.hl7.fhir.r5.utils.validation.IValidationPolicyAdvisor; import org.hl7.fhir.r5.utils.validation.IValidatorResourceFetcher; import org.hl7.fhir.r5.utils.validation.constants.BestPracticeWarningLevel; diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java index bb5a23d0a1b..c12fea3f5b4 100644 --- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java +++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java @@ -613,6 +613,13 @@ public class VersionSpecificWorkerContextWrapper extends I18nBase implements IWo } } + @Override + public void validateCodeBatchByRef( + ValidationOptions validationOptions, List list, String s) { + ValueSet valueSet = fetchResource(ValueSet.class, s); + validateCodeBatch(validationOptions, list, valueSet); + } + @Nonnull private ValidationResult doValidation( IBaseResource theValueSet, diff --git a/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/FhirInstanceValidatorDstu3Test.java b/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/FhirInstanceValidatorDstu3Test.java index 75405d94a95..394936c3dcb 100644 --- a/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/FhirInstanceValidatorDstu3Test.java +++ b/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/FhirInstanceValidatorDstu3Test.java @@ -91,6 +91,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.mock; @@ -682,8 +683,10 @@ public class FhirInstanceValidatorDstu3Test { } else if (t.getMessage().contains("sdf-15") && t.getMessage().contains("The name 'kind' is not valid for any of the possible types")) { // Find constraint sdf-15 fails with stricter core validation. return false; - } - else { + } else if (t.getMessage().contains("side is inherently a collection") && t.getMessage().endsWith("may fail or return false if there is more than one item in the content being evaluated")) { + // Some DSTU3 FHIRPath expressions now produce warnings if a singleton is compared to a collection that potentially has > 1 elements + return false; + } else { return true; } }) @@ -1338,7 +1341,7 @@ public class FhirInstanceValidatorDstu3Test { myInstanceVal.setValidatorPolicyAdvisor(policyAdvisor); myVal.validateWithResult(input); - verify(fetcher, times(3)).resolveURL(any(), any(), anyString(), anyString(), anyString()); + verify(fetcher, times(3)).resolveURL(any(), any(), anyString(), anyString(), anyString(), anyBoolean()); verify(policyAdvisor, times(4)).policyForReference(any(), any(), anyString(), anyString()); verify(fetcher, times(4)).fetch(any(), any(), anyString()); } diff --git a/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java b/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java index 44c1307f146..4484737c1c8 100644 --- a/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java +++ b/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java @@ -110,6 +110,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; @@ -1273,7 +1274,7 @@ public class FhirInstanceValidatorR4Test extends BaseTest { ValidationResult output = myFhirValidator.validateWithResult(input); logResultsAndReturnAll(output); assertEquals( - "The value provided ('notvalidcode') is not in the value set 'ObservationStatus' (http://hl7.org/fhir/ValueSet/observation-status|4.0.1), and a code is required from this value set) (error message = Unknown code 'notvalidcode' for in-memory expansion of ValueSet 'http://hl7.org/fhir/ValueSet/observation-status')", + "The value provided ('notvalidcode') is not in the value set 'ObservationStatus' (http://hl7.org/fhir/ValueSet/observation-status|4.0.1), and a code is required from this value set (error message = Unknown code 'notvalidcode' for in-memory expansion of ValueSet 'http://hl7.org/fhir/ValueSet/observation-status')", output.getMessages().get(0).getMessage()); } @@ -1516,7 +1517,7 @@ public class FhirInstanceValidatorR4Test extends BaseTest { myInstanceVal.setValidatorPolicyAdvisor(policyAdvisor); myFhirValidator.validateWithResult(encoded); - verify(resourceFetcher, times(12)).resolveURL(any(), any(), anyString(), anyString(), anyString()); + verify(resourceFetcher, times(12)).resolveURL(any(), any(), anyString(), anyString(), anyString(), anyBoolean()); verify(policyAdvisor, times(12)).policyForContained(any(), any(), any(), any(), any(), any(), any()); } diff --git a/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4b/validation/FhirInstanceValidatorR4BTest.java b/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4b/validation/FhirInstanceValidatorR4BTest.java index 7a0f0073cbd..97f735b9ebb 100644 --- a/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4b/validation/FhirInstanceValidatorR4BTest.java +++ b/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4b/validation/FhirInstanceValidatorR4BTest.java @@ -77,6 +77,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; @@ -1177,7 +1178,7 @@ public class FhirInstanceValidatorR4BTest extends BaseTest { ValidationResult output = myFhirValidator.validateWithResult(input); logResultsAndReturnAll(output); assertEquals( - "The value provided ('notvalidcode') is not in the value set 'ObservationStatus' (http://hl7.org/fhir/ValueSet/observation-status|4.3.0), and a code is required from this value set) (error message = Unknown code 'notvalidcode' for in-memory expansion of ValueSet 'http://hl7.org/fhir/ValueSet/observation-status')", + "The value provided ('notvalidcode') is not in the value set 'ObservationStatus' (http://hl7.org/fhir/ValueSet/observation-status|4.3.0), and a code is required from this value set (error message = Unknown code 'notvalidcode' for in-memory expansion of ValueSet 'http://hl7.org/fhir/ValueSet/observation-status')", output.getMessages().get(0).getMessage()); } @@ -1382,7 +1383,7 @@ public class FhirInstanceValidatorR4BTest extends BaseTest { myInstanceVal.setValidatorPolicyAdvisor(policyAdvisor); myFhirValidator.validateWithResult(encoded); - verify(resourceFetcher, times(12)).resolveURL(any(), any(), anyString(), anyString(), anyString()); + verify(resourceFetcher, times(12)).resolveURL(any(), any(), anyString(), anyString(), anyString(), anyBoolean()); verify(policyAdvisor, times(12)).policyForContained(any(), any(), any(), any(), any(), any(), any()); } @@ -1433,7 +1434,7 @@ public class FhirInstanceValidatorR4BTest extends BaseTest { ValidationResult output = myFhirValidator.validateWithResult(input); List errors = logResultsAndReturnNonInformationalOnes(output); assertEquals(1, errors.size(), errors.toString()); - assertThat(errors.get(0).getMessage(), containsString("The value provided ('BLAH') is not in the value set 'CurrencyCode' (http://hl7.org/fhir/ValueSet/currencies|4.3.0), and a code is required from this value set) (error message = Unknown code 'BLAH' for in-memory expansion of ValueSet 'http://hl7.org/fhir/ValueSet/currencies')")); + assertThat(errors.get(0).getMessage(), containsString("The value provided ('BLAH') is not in the value set 'CurrencyCode' (http://hl7.org/fhir/ValueSet/currencies|4.3.0), and a code is required from this value set (error message = Unknown code 'BLAH' for in-memory expansion of ValueSet 'http://hl7.org/fhir/ValueSet/currencies')")); } diff --git a/hapi-fhir-validation/src/test/java/org/hl7/fhir/r5/validation/FhirInstanceValidatorR5Test.java b/hapi-fhir-validation/src/test/java/org/hl7/fhir/r5/validation/FhirInstanceValidatorR5Test.java index e41debcbcff..9e5a0d54da1 100644 --- a/hapi-fhir-validation/src/test/java/org/hl7/fhir/r5/validation/FhirInstanceValidatorR5Test.java +++ b/hapi-fhir-validation/src/test/java/org/hl7/fhir/r5/validation/FhirInstanceValidatorR5Test.java @@ -874,7 +874,7 @@ public class FhirInstanceValidatorR5Test { logResultsAndReturnAll(output); assertThat( output.getMessages().get(0).getMessage(), - containsString("The value provided ('notvalidcode') is not in the value set 'Observation Status' (http://hl7.org/fhir/ValueSet/observation-status|5.0.0), and a code is required from this value set) (error message = Unknown code 'notvalidcode' for in-memory expansion of ValueSet 'http://hl7.org/fhir/ValueSet/observation-status')") + containsString("The value provided ('notvalidcode') is not in the value set 'Observation Status' (http://hl7.org/fhir/ValueSet/observation-status|5.0.0), and a code is required from this value set (error message = Unknown code 'notvalidcode' for in-memory expansion of ValueSet 'http://hl7.org/fhir/ValueSet/observation-status')") ); } diff --git a/pom.xml b/pom.xml index ab536fafcad..e0b9e910409 100644 --- a/pom.xml +++ b/pom.xml @@ -897,12 +897,10 @@ - 6.0.22.2 + 6.1.2 2.37.0 - 1.0.3 -Dfile.encoding=UTF-8 -Xmx2048m - 1.0.3 yyyy-MM-dd'T'HH:mm:ss'Z' @@ -982,6 +980,7 @@ UTF-8 1.0.1 1.28.4 + 1.0.8 3.0.0-PRE5 @@ -1396,7 +1395,7 @@ net.sourceforge.htmlunit htmlunit - 2.67.0 + 2.70.0 @@ -2190,14 +2189,9 @@ test - xpp3 + org.ogce xpp3 - 1.1.4c - - - xpp3 - xpp3_xpath - 1.1.4c + 1.1.6 org.flywaydb