Merge branch 'master' into rel_7_3_tracking

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 mass_ingestion_mode_enabled = false;
   private final Set<String> auto_version_reference_at_paths = new HashSet<>();
   private Boolean language_search_parameter_enabled = false;
   private Boolean dao_scheduling_enabled = true;
@@ -324,6 +325,14 @@ public Cors getCors() {
     this.allow_override_default_search_params = allow_override_default_search_params;
   }
 
+  public Boolean getMass_ingestion_mode_enabled() {
+    return mass_ingestion_mode_enabled;
+  }
+
+  public void setMass_ingestion_mode_enabled(Boolean mass_ingestion_mode_enabled) {
+    this.mass_ingestion_mode_enabled = mass_ingestion_mode_enabled;
+  }
+
   public Boolean getAuto_create_placeholder_reference_targets() {
     return auto_create_placeholder_reference_targets;
   }
@@ -913,4 +922,4 @@ public Boolean getResource_dbhistory_enabled() {
 public void setResource_dbhistory_enabled(Boolean resource_dbhistory_enabled) {
 	this.resource_dbhistory_enabled = resource_dbhistory_enabled;
 }
-}
+}

src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java

@@ -135,6 +135,8 @@ public class FhirServerConfigCommon {
 						: StorageSettings.IndexEnabledEnum.DISABLED);
 		jpaStorageSettings.setAutoCreatePlaceholderReferenceTargets(
 				appProperties.getAuto_create_placeholder_reference_targets());
+		jpaStorageSettings.setMassIngestionMode(
+				appProperties.getMass_ingestion_mode_enabled());
 		jpaStorageSettings.setAutoVersionReferenceAtPaths(appProperties.getAuto_version_reference_at_paths());
 		jpaStorageSettings.setEnforceReferentialIntegrityOnWrite(
 				appProperties.getEnforce_referential_integrity_on_write());