Skip to content

Commit 3090dc9

Browse files
committed
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 <lmsurpre@us.ibm.com>
1 parent 4c8e459 commit 3090dc9

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

fhir-search/src/main/java/com/ibm/fhir/search/parameters/ParametersHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.util.logging.Logger;
1919
import java.util.stream.Collectors;
2020

21+
import com.ibm.fhir.config.FHIRConfigHelper;
2122
import com.ibm.fhir.config.FHIRConfiguration;
2223
import com.ibm.fhir.config.FHIRRequestContext;
2324
import com.ibm.fhir.config.PropertyGroup;
@@ -106,8 +107,7 @@ private Map<String, Map<String, ParametersMap>> buildSearchParameterMaps() {
106107
log.fine(("Computing search parameters for tenant " + tenant));
107108
}
108109

109-
PropertyGroup root = config.loadConfigurationForTenant(tenant);
110-
PropertyGroup rsrcsGroup = root == null ? null : root.getPropertyGroup(FHIRConfiguration.PROPERTY_RESOURCES);
110+
PropertyGroup rsrcsGroup = FHIRConfigHelper.getPropertyGroup(FHIRConfiguration.PROPERTY_RESOURCES);
111111
result.put(tenant, computeTenantSPs(rsrcsGroup));
112112
} catch (Exception e) {
113113
log.log(Level.SEVERE, "Error while computing search parameters for tenant " + tenant, e);

0 commit comments

Comments
 (0)