Merge remote-tracking branch 'upstream/master'

Dockerfile

@@ -1,7 +1,7 @@
 FROM maven:3.8-openjdk-17-slim as build-hapi
 WORKDIR /tmp/hapi-fhir-jpaserver-starter
 
-ARG OPENTELEMETRY_JAVA_AGENT_VERSION=1.15.0
+ARG OPENTELEMETRY_JAVA_AGENT_VERSION=1.16.0
 RUN curl -LSsO https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v${OPENTELEMETRY_JAVA_AGENT_VERSION}/opentelemetry-javaagent.jar
 
 COPY pom.xml .

src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java

@@ -46,6 +46,7 @@ public class AppProperties {
  private Boolean graphql_enabled = false;
  private Boolean binary_storage_enabled = false;
  private Boolean bulk_export_enabled = false;
+ private Boolean bulk_import_enabled = false;
  private Boolean default_pretty_print = true;
  private Integer default_page_size = 20;
  private Integer max_binary_size = null;
@@ -402,6 +403,14 @@ public void setBulk_export_enabled(Boolean bulk_export_enabled) {
  this.bulk_export_enabled = bulk_export_enabled;
  }
 
+ public Boolean getBulk_import_enabled() {
+ return bulk_import_enabled;
+ }
+
+ public void setBulk_import_enabled(Boolean bulk_import_enabled) {
+ this.bulk_import_enabled = bulk_import_enabled;
+ }
+
  public EncodingEnum getDefault_encoding() {
  return default_encoding;
  }

src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java

@@ -1,5 +1,6 @@
 package ca.uhn.fhir.jpa.starter;
 
+import ca.uhn.fhir.batch2.jobs.imprt.BulkDataImportProvider;
 import ca.uhn.fhir.batch2.jobs.reindex.ReindexProvider;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
@@ -78,6 +79,8 @@ public class BaseJpaRestfulServer extends RestfulServer {
  @Autowired
  BulkDataExportProvider bulkDataExportProvider;
  @Autowired
+ BulkDataImportProvider bulkDataImportProvider;
+ @Autowired
  PartitionManagementProvider partitionManagementProvider;
 
  @Autowired
@@ -364,6 +367,11 @@ protected void initialize() throws ServletException {
  registerProvider(bulkDataExportProvider);
  }
 
+ //Bulk Import
+ if (appProperties.getBulk_import_enabled()) {
+ registerProvider(bulkDataImportProvider);
+ }
+
  // valueSet Operations i.e $expand
  registerProvider(myValueSetOperationProvider);
 

src/main/resources/application.yaml

@@ -95,6 +95,8 @@ hapi:
  ### !!Extended Lucene/Elasticsearch Indexing is still a experimental feature, expect some features (e.g. _total=accurate) to not work as expected!!
  ### more information here: https://hapifhir.io/hapi-fhir/docs/server_jpa/elastic.html
  advanced_lucene_indexing: false
+ bulk_export_enabled: false
+ 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