From c5e460dab02c32714fbe05f44b514ef8bdf273b8 Mon Sep 17 00:00:00 2001 From: Patrick Werner Date: Sat, 3 Sep 2022 20:04:59 +0200 Subject: [PATCH] added appProperties.getInline_resource_storage_below_size() (#420) * added appProperties.getInline_resource_storage_below_size() * indentations --- .../uhn/fhir/jpa/starter/AppProperties.java | 11 ++++++++- .../jpa/starter/BaseJpaRestfulServer.java | 4 ++++ src/main/resources/application.yaml | 23 ++++++++++--------- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java index 27bb715..4314317 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -45,6 +45,7 @@ public class AppProperties { private Boolean filter_search_enabled = true; private Boolean graphql_enabled = false; private Boolean binary_storage_enabled = false; + private Integer inline_resource_storage_below_size = 0; private Boolean bulk_export_enabled = false; private Boolean bulk_import_enabled = false; private Boolean default_pretty_print = true; @@ -395,7 +396,15 @@ public class AppProperties { this.binary_storage_enabled = binary_storage_enabled; } - public Boolean getBulk_export_enabled() { + public Integer getInline_resource_storage_below_size() { + return inline_resource_storage_below_size; + } + + public void setInline_resource_storage_below_size(Integer inline_resource_storage_below_size) { + this.inline_resource_storage_below_size = inline_resource_storage_below_size; + } + + public Boolean getBulk_export_enabled() { return bulk_export_enabled; } diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java b/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java index 4cad6bf..81c0e0f 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java @@ -418,6 +418,10 @@ public class BaseJpaRestfulServer extends RestfulServer { daoConfig.setLastNEnabled(true); } + if(appProperties.getInline_resource_storage_below_size() != 0){ + daoConfig.setInlineResourceTextBelowSize(appProperties.getInline_resource_storage_below_size()); + } + daoConfig.setStoreResourceInHSearchIndex(appProperties.getStore_resource_in_lucene_index_enabled()); daoConfig.getModelConfig().setNormalizedQuantitySearchLevel(appProperties.getNormalized_quantity_search_level()); daoConfig.getModelConfig().setIndexOnContainedResources(appProperties.getEnable_index_contained_resource()); diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 3c0be66..b8c322c 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -100,7 +100,7 @@ hapi: bulk_import_enabled: false # enforce_referential_integrity_on_delete: false # This is an experimental feature, and does not fully support _total and other FHIR features. -# enforce_referential_integrity_on_delete: false + # enforce_referential_integrity_on_delete: false # enforce_referential_integrity_on_write: false # etag_support_enabled: true # expunge_enabled: true @@ -110,8 +110,8 @@ hapi: # graphql_enabled: true # narrative_enabled: true # mdm_enabled: true -# local_base_urls: -# - https://hapi.fhir.org/baseR4 + # local_base_urls: + # - https://hapi.fhir.org/baseR4 mdm_enabled: false # partitioning: # allow_references_across_partitions: false @@ -128,10 +128,10 @@ hapi: search-coord-queue-capacity: 200 # Threadpool size for BATCH'ed GETs in a bundle. -# bundle_batch_pool_size: 10 -# bundle_batch_pool_max_size: 50 + # bundle_batch_pool_size: 10 + # bundle_batch_pool_max_size: 50 -# logger: + # logger: # error_format: 'ERROR - ${requestVerb} ${requestUrl}' # format: >- # Path[${servletPath}] Source[${requestHeader.x-forwarded-for}] @@ -155,10 +155,11 @@ hapi: server_address: "http://hapi.fhir.org/baseR4" refuse_to_fetch_third_party_urls: false fhir_version: R4 -# validation: -# requests_enabled: true -# responses_enabled: true -# binary_storage_enabled: true + # validation: + # requests_enabled: true + # responses_enabled: true + # binary_storage_enabled: true + inline_resource_storage_below_size: 4000 # bulk_export_enabled: true # subscription: # resthook_enabled: true @@ -190,4 +191,4 @@ hapi: # rest_url: 'localhost:9200' # protocol: 'http' # schema_management_strategy: CREATE -# username: SomeUsername +# username: SomeUsername \ No newline at end of file