From 3090dc99c039384014c51c15087ff3709d0f77a4 Mon Sep 17 00:00:00 2001 From: Lee Surprenant Date: Fri, 1 Apr 2022 14:19:50 -0400 Subject: [PATCH] issue #3536 - use FHIRConfigHelper to get fhirServer/resources So that a missing `fhirServer/resources` property in the tenant-specific config will fall back to the `fhirServer/resources` property group in the default tenant config. Signed-off-by: Lee Surprenant --- .../java/com/ibm/fhir/search/parameters/ParametersHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fhir-search/src/main/java/com/ibm/fhir/search/parameters/ParametersHelper.java b/fhir-search/src/main/java/com/ibm/fhir/search/parameters/ParametersHelper.java index 1a1a51da28a..dc8164ca3d3 100644 --- a/fhir-search/src/main/java/com/ibm/fhir/search/parameters/ParametersHelper.java +++ b/fhir-search/src/main/java/com/ibm/fhir/search/parameters/ParametersHelper.java @@ -18,6 +18,7 @@ import java.util.logging.Logger; import java.util.stream.Collectors; +import com.ibm.fhir.config.FHIRConfigHelper; import com.ibm.fhir.config.FHIRConfiguration; import com.ibm.fhir.config.FHIRRequestContext; import com.ibm.fhir.config.PropertyGroup; @@ -106,8 +107,7 @@ private Map> buildSearchParameterMaps() { log.fine(("Computing search parameters for tenant " + tenant)); } - PropertyGroup root = config.loadConfigurationForTenant(tenant); - PropertyGroup rsrcsGroup = root == null ? null : root.getPropertyGroup(FHIRConfiguration.PROPERTY_RESOURCES); + PropertyGroup rsrcsGroup = FHIRConfigHelper.getPropertyGroup(FHIRConfiguration.PROPERTY_RESOURCES); result.put(tenant, computeTenantSPs(rsrcsGroup)); } catch (Exception e) { log.log(Level.SEVERE, "Error while computing search parameters for tenant " + tenant, e);