Merge remote-tracking branch 'origin/master' into rel_8_5-tracking

+ update HAPI to 8.5.9-SNAPSHOT

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

@@ -126,6 +126,7 @@ public class AppProperties {
 	private Map<String, RemoteSystem> remote_terminology_service = null;
 	private Boolean match_url_cache_enabled = false;
 	private Boolean index_storage_optimized = false;
+	private Boolean mark_resources_for_reindexing_upon_search_parameter_change = true;
 	private Integer reindex_thread_count = null;
 	private Integer expunge_thread_count = null;
 
@@ -811,6 +812,16 @@ public class AppProperties {
 		index_storage_optimized = theIndex_storage_optimized;
 	}
 
+	public boolean getMark_resources_for_reindexing_upon_search_parameter_change() {
+		return defaultIfNull(mark_resources_for_reindexing_upon_search_parameter_change, true);
+	}
+
+	public void setMark_resources_for_reindexing_upon_search_parameter_change(
+			Boolean mark_resources_for_reindexing_upon_search_parameter_change) {
+		this.mark_resources_for_reindexing_upon_search_parameter_change =
+				mark_resources_for_reindexing_upon_search_parameter_change;
+	}
+
 	public Integer getReindex_thread_count() {
 		return reindex_thread_count;
 	}

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

@@ -190,6 +190,8 @@ public class FhirServerConfigCommon {
 		jpaStorageSettings.setSchedulingDisabled(!appProperties.getDao_scheduling_enabled());
 		jpaStorageSettings.setIndexStorageOptimized(appProperties.getIndex_storage_optimized());
 		jpaStorageSettings.setMatchUrlCacheEnabled(appProperties.getMatch_url_cache_enabled());
+		jpaStorageSettings.setMarkResourcesForReindexingUponSearchParameterChange(
+				appProperties.getMark_resources_for_reindexing_upon_search_parameter_change());
 		jpaStorageSettings.setDeleteEnabled(appProperties.getDelete_enabled());
 		jpaStorageSettings.setDeleteExpungeEnabled(appProperties.getDelete_expunge_enabled());
 		jpaStorageSettings.setExpungeEnabled(appProperties.getExpunge_enabled());

src/main/resources/application-cds.yaml

@@ -170,6 +170,11 @@ hapi:
         version: 2.0.0
         installMode: STORE_AND_INSTALL
         installResourceTypes: [ "CodeSystem", "ValueSet", "ConceptMap", "ActivityDefinition", "PlanDefinition", "Library", "Measure", "StructureDefinition" ]
+      uscql:
+        name: hl7.fhir.us.cql
+        version: 1.0.0
+        installMode: STORE_AND_INSTALL
+        installResourceTypes: [ "CodeSystem", "ValueSet", "ConceptMap", "ActivityDefinition", "PlanDefinition", "Library", "Measure", "StructureDefinition" ]
     #   swiss:
     #     name: swiss.mednet.fhir
     #     version: 0.8.0

src/main/resources/application.yaml

@@ -283,6 +283,7 @@ hapi:
     # Defaults to Runtime.getRuntime().availableProcessors() if not specified
     # reindex_thread_count: 4        # Number of threads to use for reindex operations
     # expunge_thread_count: 4        # Number of threads to use for expunge operations
+    # mark_resources_for_reindexing_upon_search_parameter_change: false
 
     # -------------------------------------------------------------------------------
     # G. Narrative & Validation