From 5df8e034cb5e2ef3a42e3e037b3fd44d4e3c48a4 Mon Sep 17 00:00:00 2001 From: Eric Secules Date: Sat, 9 Nov 2024 00:30:05 -0800 Subject: [PATCH] #754 add application.yaml setting for conditional_create_duplicate_identifiers_enabled (#755) Co-authored-by: Eric Secules --- src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java | 9 +++++++++ .../fhir/jpa/starter/common/FhirServerConfigCommon.java | 2 ++ src/main/resources/application.yaml | 1 + src/main/resources/cds.application.yaml | 1 + src/test/resources/application.yaml | 1 + 5 files changed, 14 insertions(+) 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 2d71d36..7abf880 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -793,6 +793,7 @@ public Cors getCors() { private Boolean partitioning_include_in_search_hashes = false; private Boolean allow_references_across_partitions = false; + private Boolean conditional_create_duplicate_identifiers_enabled = false; public Boolean getPartitioning_include_in_search_hashes() { return partitioning_include_in_search_hashes; @@ -808,6 +809,14 @@ public Cors getCors() { public void setAllow_references_across_partitions(Boolean allow_references_across_partitions) { this.allow_references_across_partitions = allow_references_across_partitions; } + + public Boolean getConditional_create_duplicate_identifiers_enabled() { + return conditional_create_duplicate_identifiers_enabled; + } + + public void setConditional_create_duplicate_identifiers_enabled(Boolean conditional_create_duplicate_identifiers_enabled) { + this.conditional_create_duplicate_identifiers_enabled = conditional_create_duplicate_identifiers_enabled; + } } public static class Subscription { diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java b/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java index f046534..51a4648 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java @@ -247,6 +247,8 @@ public class FhirServerConfigCommon { } else { retVal.setAllowReferencesAcrossPartitions(CrossPartitionReferenceMode.NOT_ALLOWED); } + retVal.setConditionalCreateDuplicateIdentifiersEnabled( + appProperties.getPartitioning().getConditional_create_duplicate_identifiers_enabled()); } return retVal; diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 8cb6700..97d439e 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -226,6 +226,7 @@ hapi: # partitioning: # allow_references_across_partitions: false # partitioning_include_in_search_hashes: false + # conditional_create_duplicate_identifiers_enabled: false cors: allow_Credentials: true # These are allowed_origin patterns, see: https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/cors/CorsConfiguration.html#setAllowedOriginPatterns-java.util.List- diff --git a/src/main/resources/cds.application.yaml b/src/main/resources/cds.application.yaml index ee6701f..49c4228 100644 --- a/src/main/resources/cds.application.yaml +++ b/src/main/resources/cds.application.yaml @@ -225,6 +225,7 @@ hapi: # partitioning: # allow_references_across_partitions: false # partitioning_include_in_search_hashes: false + # conditional_create_duplicate_identifiers_enabled: false cors: allow_Credentials: true # These are allowed_origin patterns, see: https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/cors/CorsConfiguration.html#setAllowedOriginPatterns-java.util.List- diff --git a/src/test/resources/application.yaml b/src/test/resources/application.yaml index 6fffa35..619ea61 100644 --- a/src/test/resources/application.yaml +++ b/src/test/resources/application.yaml @@ -146,6 +146,7 @@ hapi: # partitioning: # allow_references_across_partitions: false # partitioning_include_in_search_hashes: false + # partitioning_include_in_search_hashes #cors: # allow_Credentials: true # These are allowed_origin patterns, see: https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/cors/CorsConfiguration.html#setAllowedOriginPatterns-java.util.List-