Merge branch 'master' into rel_5_7

src/main/resources/application.yaml

@@ -1,4 +1,10 @@
 spring:
+  main:
+    allow-circular-references: true
+  flyway:
+    enabled: false
+    check-location: false
+    baselineOnMigrate: true
   datasource:
     url: 'jdbc:h2:file:./target/database/h2'
     #url: jdbc:h2:mem:test_mem
@@ -10,13 +16,14 @@ spring:
     # database connection pool size
     hikari:
       maximum-pool-size: 10
-  flyway:
-    check-location: false
-    baselineOnMigrate: true
   jpa:
     properties:
       hibernate.format_sql: false
       hibernate.show_sql: false
+      #Hibernate dialect is automatically detected except Postgres and H2.
+      #If using H2, then supply the value of ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect
+      #If using postgres, then supply the value of ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect
+
       hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect
   #      hibernate.hbm2ddl.auto: update
   #      hibernate.jdbc.batch_size: 20
@@ -77,7 +84,9 @@ hapi:
     #    enable_repository_validating_interceptor: false
     #    enable_index_missing_fields: false
     #    enable_index_contained_resource: false
-    #    enforce_referential_integrity_on_delete: false
+    #    advanced_lucene_indexing: false
+    advanced_lucene_indexing: true
+#    enforce_referential_integrity_on_delete: false
     #    enforce_referential_integrity_on_write: false
     #    etag_support_enabled: true
     #    expunge_enabled: true
@@ -87,6 +96,9 @@ hapi:
     #    filter_search_enabled: true
     #    graphql_enabled: true
     #    narrative_enabled: true
+    #    mdm_enabled: true
+#    local_base_urls:
+#      - https://hapi.fhir.org/baseR4
     mdm_enabled: true
     #    partitioning:
     #      allow_references_across_partitions: false
@@ -102,7 +114,11 @@ hapi:
     search-coord-max-pool-size: 100
     search-coord-queue-capacity: 200
 
-    #    logger:
+    # Threadpool size for BATCH'ed GETs in a bundle.
+#    bundle_batch_pool_size: 10
+#    bundle_batch_pool_max_size: 50
+
+#    logger:
     #      error_format: 'ERROR - ${requestVerb} ${requestUrl}'
     #      format: >-
     #        Path[${servletPath}] Source[${requestHeader.x-forwarded-for}]
@@ -145,6 +161,7 @@ hapi:
 #        startTlsRequired:
 #        quitWait:
 #    lastn_enabled: true
+#    store_resource_in_lucene_index_enabled: true
 ###  This is configuration for normalized quantity serach level default is 0
 ###   0: NORMALIZED_QUANTITY_SEARCH_NOT_SUPPORTED - default
 ###   1: NORMALIZED_QUANTITY_STORAGE_SUPPORTED