From dd299100bfdcfee4704ccf33df8a4cd697e7ef2b Mon Sep 17 00:00:00 2001 From: James Agnew Date: Tue, 26 Nov 2019 08:48:10 -0300 Subject: [PATCH] Fix regressing caused by merged PR --- src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java | 2 ++ src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java b/src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java index 91abbb0..621ba33 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java @@ -10,6 +10,7 @@ import org.hibernate.search.elasticsearch.cfg.ElasticsearchIndexStatus; import org.hibernate.search.elasticsearch.cfg.IndexSchemaManagementStrategy; import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import java.io.FileInputStream; import java.io.InputStream; import java.util.Arrays; @@ -331,6 +332,7 @@ public class HapiProperties { return HapiProperties.getProperty(ALLOWED_BUNDLE_TYPES, ""); } + @Nonnull public static Set getSupportedResourceTypes() { String[] types = defaultString(getProperty("supported_resource_types")).split(","); return Arrays.stream(types) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java b/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java index 9c7ba74..f5a47f6 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java @@ -67,8 +67,8 @@ public class JpaRestfulServer extends RestfulServer { .getAttribute("org.springframework.web.context.WebApplicationContext.ROOT"); // Customize supported resource types Set supportedResourceTypes = HapiProperties.getSupportedResourceTypes(); - - if (!supportedResourceTypes.contains("SearchParameter")) { + + if (!supportedResourceTypes.isEmpty() && !supportedResourceTypes.contains("SearchParameter")) { supportedResourceTypes.add("SearchParameter"); }