From b2ebdec183d529e200ee2742af9fa82e0e7c9d7f Mon Sep 17 00:00:00 2001 From: Luke deGruchy Date: Fri, 24 Feb 2023 11:32:54 -0500 Subject: [PATCH] Address leftover code review feedback from the upgrade to core 5.6.97. (#4585) --- .../jpa/searchparam/extractor/BaseSearchParamExtractor.java | 1 - .../main/java/org/hl7/fhir/r4/hapi/fluentpath/FhirPathR4.java | 4 +--- .../support/CommonCodeSystemsTerminologyService.java | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java index 5725625fef4..aa27f908ce5 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java @@ -102,7 +102,6 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.apache.commons.lang3.StringUtils.startsWith; import static org.apache.commons.lang3.StringUtils.trim; -// TODO: come back to this and scrutinize the changes James did to this class public abstract class BaseSearchParamExtractor implements ISearchParamExtractor { public static final Set COORDS_INDEX_PATHS; 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 a7e3b66fd3c..bdb3dd9dde4 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 @@ -22,12 +22,10 @@ import java.util.Optional; public class FhirPathR4 implements IFhirPath { - private FHIRPathEngine myEngine; + private final FHIRPathEngine myEngine; public FhirPathR4(FhirContext theCtx) { IValidationSupport validationSupport = theCtx.getValidationSupport(); -// add the flag to make the FP evaluation not be strict. david shouuld be able to point to it - the class where this needs to be done is FhirPathR4 - in there we construct a new instance of FHIRPathEngine . the latter is a core library, and it's the thing that needs to be configured with this new flag - myEngine = new FHIRPathEngine(new HapiWorkerContext(theCtx, validationSupport)); // These changes are to make the FP evaluation non-strict myEngine.setDoNotEnforceAsCaseSensitive(true); diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/CommonCodeSystemsTerminologyService.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/CommonCodeSystemsTerminologyService.java index 13d0032a19a..06d580f897c 100644 --- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/CommonCodeSystemsTerminologyService.java +++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/CommonCodeSystemsTerminologyService.java @@ -560,7 +560,7 @@ public class CommonCodeSystemsTerminologyService implements IValidationSupport { } /** - * TODO: This method can be removed once we have bumped the R4B version in core + * N.B.: We are keeping this as a shim due to the upgrade we did to core 5.6.97+ */ public static FhirVersionEnum getFhirVersionEnum(@Nonnull FhirContext theFhirContext, @Nonnull IBaseResource theResource) { FhirVersionEnum structureFhirVersionEnum = theResource.getStructureFhirVersionEnum();