From fe18cce023af46f75e47599fe4f3ef1091555767 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Wed, 12 Jun 2024 11:56:31 -0500 Subject: [PATCH 01/13] enable mass ingestion mode --- src/main/resources/application.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index d7dcaf14891..1cb74c59f8e 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -116,6 +116,7 @@ hapi: # allow_multiple_delete: true # allow_override_default_search_params: true # auto_create_placeholder_reference_targets: false + # mass_ingestion_mode: false ### tells the server to automatically append the current version of the target resource to references at these paths # auto_version_reference_at_paths: Device.patient, Device.location, Device.parent, DeviceMetric.parent, DeviceMetric.source, Observation.device, Observation.subject # ips_enabled: false From cc51fa608208e20e3aee6a1590130de35cabe306 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Wed, 12 Jun 2024 12:00:26 -0500 Subject: [PATCH 02/13] enable mass ingestion mode --- src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 eb156995df4..b9720d938da 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -37,6 +37,7 @@ public class AppProperties { private Boolean allow_multiple_delete = false; private Boolean allow_override_default_search_params = true; private Boolean auto_create_placeholder_reference_targets = false; + private Boolean enable_mass_ingestion_mode = false; private final Set auto_version_reference_at_paths = new HashSet<>(); private Boolean language_search_parameter_enabled = false; private Boolean dao_scheduling_enabled = true; @@ -328,6 +329,10 @@ public Boolean getAuto_create_placeholder_reference_targets() { return auto_create_placeholder_reference_targets; } + public Boolean getEnable_mass_ingestion_mode() { + return enable_mass_ingestion_mode; + } + public void setAuto_create_placeholder_reference_targets( Boolean auto_create_placeholder_reference_targets) { this.auto_create_placeholder_reference_targets = auto_create_placeholder_reference_targets; @@ -913,4 +918,4 @@ public Boolean getResource_dbhistory_enabled() { public void setResource_dbhistory_enabled(Boolean resource_dbhistory_enabled) { this.resource_dbhistory_enabled = resource_dbhistory_enabled; } -} \ No newline at end of file +} From 2239fe5b4586212d8fb3957eed5e82bb0e586b1e Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Wed, 12 Jun 2024 12:02:05 -0500 Subject: [PATCH 03/13] enable mass ingestion mode --- .../ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java | 2 ++ 1 file changed, 2 insertions(+) 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 10ea4a6b886..14318f6ecc1 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 @@ -100,6 +100,8 @@ public JpaStorageSettings jpaStorageSettings(AppProperties appProperties) { : StorageSettings.IndexEnabledEnum.DISABLED); jpaStorageSettings.setAutoCreatePlaceholderReferenceTargets( appProperties.getAuto_create_placeholder_reference_targets()); + jpaStorageSettings.setEnableMassIngestionMode( + appProperties.getEnable_mass_ingestion_mode()); jpaStorageSettings.setAutoVersionReferenceAtPaths(appProperties.getAuto_version_reference_at_paths()); jpaStorageSettings.setEnforceReferentialIntegrityOnWrite( appProperties.getEnforce_referential_integrity_on_write()); From 7ef0e0614d3f1f199a5150c8dd6eb77b244cdf75 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Wed, 12 Jun 2024 12:03:03 -0500 Subject: [PATCH 04/13] typo --- src/main/resources/application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 1cb74c59f8e..48feebc6c3c 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -116,7 +116,7 @@ hapi: # allow_multiple_delete: true # allow_override_default_search_params: true # auto_create_placeholder_reference_targets: false - # mass_ingestion_mode: false + # enable_mass_ingestion_mode: false ### tells the server to automatically append the current version of the target resource to references at these paths # auto_version_reference_at_paths: Device.patient, Device.location, Device.parent, DeviceMetric.parent, DeviceMetric.source, Observation.device, Observation.subject # ips_enabled: false From d4db8fbb1b1b1dd8959ff606f2595a61c89bd224 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Wed, 12 Jun 2024 14:16:17 -0500 Subject: [PATCH 05/13] fix: forgot to include a setter with my getter --- .../java/ca/uhn/fhir/jpa/starter/AppProperties.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 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 b9720d938da..8a59e2f92d8 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -325,14 +325,18 @@ public void setAllow_override_default_search_params( this.allow_override_default_search_params = allow_override_default_search_params; } - public Boolean getAuto_create_placeholder_reference_targets() { - return auto_create_placeholder_reference_targets; - } - public Boolean getEnable_mass_ingestion_mode() { return enable_mass_ingestion_mode; } + public void setEnable_mass_ingestion_mode(Boolean enable_mass_ingestion_mode) { + this.enable_mass_ingestion_mode = enable_mass_ingestion_mode; + } + + public Boolean getAuto_create_placeholder_reference_targets() { + return auto_create_placeholder_reference_targets; + } + public void setAuto_create_placeholder_reference_targets( Boolean auto_create_placeholder_reference_targets) { this.auto_create_placeholder_reference_targets = auto_create_placeholder_reference_targets; From 056c9a16b2cd25fbe4130c57dcec44ca10fed913 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Thu, 13 Jun 2024 16:01:53 -0500 Subject: [PATCH 06/13] fix: use the correct function name --- .../ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 14318f6ecc1..e7b1d753e39 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 @@ -100,7 +100,7 @@ public JpaStorageSettings jpaStorageSettings(AppProperties appProperties) { : StorageSettings.IndexEnabledEnum.DISABLED); jpaStorageSettings.setAutoCreatePlaceholderReferenceTargets( appProperties.getAuto_create_placeholder_reference_targets()); - jpaStorageSettings.setEnableMassIngestionMode( + jpaStorageSettings.setMassIngestionMode( appProperties.getEnable_mass_ingestion_mode()); jpaStorageSettings.setAutoVersionReferenceAtPaths(appProperties.getAuto_version_reference_at_paths()); jpaStorageSettings.setEnforceReferentialIntegrityOnWrite( From 40411f6fb825f2386b7c059fa08e3378e714e66f Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Fri, 14 Jun 2024 11:17:06 -0500 Subject: [PATCH 07/13] fix: use the existing naming convention Co-authored-by: Kevin Dougan SmileCDR <72025369+KevinDougan-SmileCDR@users.noreply.github.com> --- src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8a59e2f92d8..c8b6bd5fdee 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -37,7 +37,7 @@ public class AppProperties { private Boolean allow_multiple_delete = false; private Boolean allow_override_default_search_params = true; private Boolean auto_create_placeholder_reference_targets = false; - private Boolean enable_mass_ingestion_mode = false; + private Boolean mass_ingestion_mode_enabled = false; private final Set auto_version_reference_at_paths = new HashSet<>(); private Boolean language_search_parameter_enabled = false; private Boolean dao_scheduling_enabled = true; From 37c26a464a9baf3c2bdca02802c24de62ba100f3 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Fri, 14 Jun 2024 11:17:35 -0500 Subject: [PATCH 08/13] fix: use the existing naming convention Co-authored-by: Kevin Dougan SmileCDR <72025369+KevinDougan-SmileCDR@users.noreply.github.com> --- src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c8b6bd5fdee..c465cba13bd 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -325,7 +325,7 @@ public void setAllow_override_default_search_params( this.allow_override_default_search_params = allow_override_default_search_params; } - public Boolean getEnable_mass_ingestion_mode() { + public Boolean getMass_ingestion_mode_enabled() { return enable_mass_ingestion_mode; } From 9a02b132855b4e8990f59f92ba85762d7a565797 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Fri, 14 Jun 2024 11:18:01 -0500 Subject: [PATCH 09/13] fix: use the existing naming convention Co-authored-by: Kevin Dougan SmileCDR <72025369+KevinDougan-SmileCDR@users.noreply.github.com> --- src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c465cba13bd..a351f9d1e6a 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -329,7 +329,7 @@ public Boolean getMass_ingestion_mode_enabled() { return enable_mass_ingestion_mode; } - public void setEnable_mass_ingestion_mode(Boolean enable_mass_ingestion_mode) { + public void setMass_ingestion_mode_enabled(Boolean mass_ingestion_mode_enabled) { this.enable_mass_ingestion_mode = enable_mass_ingestion_mode; } From ce0df03aac4097db320b48c60d28cf681f7878b2 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Fri, 14 Jun 2024 11:18:17 -0500 Subject: [PATCH 10/13] fix: use the existing naming convention Co-authored-by: Kevin Dougan SmileCDR <72025369+KevinDougan-SmileCDR@users.noreply.github.com> --- src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a351f9d1e6a..0951b646bf6 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -326,7 +326,7 @@ public void setAllow_override_default_search_params( } public Boolean getMass_ingestion_mode_enabled() { - return enable_mass_ingestion_mode; + return mass_ingestion_mode_enabled; } public void setMass_ingestion_mode_enabled(Boolean mass_ingestion_mode_enabled) { From 74344279e2b93ee461a5a59bc62f902fc61ec9ef Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Fri, 14 Jun 2024 11:18:35 -0500 Subject: [PATCH 11/13] fix: use the existing naming convention Co-authored-by: Kevin Dougan SmileCDR <72025369+KevinDougan-SmileCDR@users.noreply.github.com> --- src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0951b646bf6..0f63df44ae5 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -330,7 +330,7 @@ public Boolean getMass_ingestion_mode_enabled() { } public void setMass_ingestion_mode_enabled(Boolean mass_ingestion_mode_enabled) { - this.enable_mass_ingestion_mode = enable_mass_ingestion_mode; + this.mass_ingestion_mode_enabled = mass_ingestion_mode_enabled; } public Boolean getAuto_create_placeholder_reference_targets() { From 0d8642ddfa95483ec457be1d6c74605b27837fe7 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Fri, 14 Jun 2024 11:18:52 -0500 Subject: [PATCH 12/13] fix: use the existing naming convention Co-authored-by: Kevin Dougan SmileCDR <72025369+KevinDougan-SmileCDR@users.noreply.github.com> --- src/main/resources/application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 48feebc6c3c..5b2a868e500 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -116,7 +116,7 @@ hapi: # allow_multiple_delete: true # allow_override_default_search_params: true # auto_create_placeholder_reference_targets: false - # enable_mass_ingestion_mode: false + # mass_ingestion_mode_enabled: false ### tells the server to automatically append the current version of the target resource to references at these paths # auto_version_reference_at_paths: Device.patient, Device.location, Device.parent, DeviceMetric.parent, DeviceMetric.source, Observation.device, Observation.subject # ips_enabled: false From 255031b26fe4ef6e5e745932621bfee2ede6094e Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Fri, 14 Jun 2024 11:19:09 -0500 Subject: [PATCH 13/13] fix: use the existing naming convention Co-authored-by: Kevin Dougan SmileCDR <72025369+KevinDougan-SmileCDR@users.noreply.github.com> --- .../ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e7b1d753e39..0f15abff8e7 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 @@ -101,7 +101,7 @@ public JpaStorageSettings jpaStorageSettings(AppProperties appProperties) { jpaStorageSettings.setAutoCreatePlaceholderReferenceTargets( appProperties.getAuto_create_placeholder_reference_targets()); jpaStorageSettings.setMassIngestionMode( - appProperties.getEnable_mass_ingestion_mode()); + appProperties.getMass_ingestion_mode_enabled()); jpaStorageSettings.setAutoVersionReferenceAtPaths(appProperties.getAuto_version_reference_at_paths()); jpaStorageSettings.setEnforceReferentialIntegrityOnWrite( appProperties.getEnforce_referential_integrity_on_write());