Merge remote-tracking branch 'origin/cr-3-22-0' into rel_8_3_tracking

pom.xml

@@ -6,7 +6,7 @@
     <properties>
         <java.version>17</java.version>
         <hapi.fhir.jpa.server.starter.revision>1</hapi.fhir.jpa.server.starter.revision>
-        <clinical-reasoning.version>3.21.0</clinical-reasoning.version>
+        <clinical-reasoning.version>3.22.0</clinical-reasoning.version>
     </properties>
 
     <!-- one-liner to take you to the cloud with settings form the application.yaml file: -->

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

@@ -1,6 +1,7 @@
 package ca.uhn.fhir.jpa.starter;
 
 import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.jpa.api.config.JpaStorageSettings;
 import ca.uhn.fhir.jpa.api.config.JpaStorageSettings.ClientIdStrategyEnum;
 import ca.uhn.fhir.jpa.api.config.JpaStorageSettings.IdStrategyEnum;
 import ca.uhn.fhir.jpa.model.entity.NormalizedQuantitySearchLevel;
@@ -34,6 +35,7 @@ public class AppProperties {
 	private Boolean mdm_enabled = false;
 	private String mdm_rules_json_location = "mdm-rules.json";
 	private boolean advanced_lucene_indexing = false;
+	private boolean search_index_full_text_enabled = false;
 	private boolean enable_index_of_type = false;
 	private Boolean allow_cascading_deletes = false;
 	private Boolean allow_contains_searches = true;
@@ -105,6 +107,8 @@ public class AppProperties {
 	private Integer pre_expand_value_sets_default_count = 1000;
 	private Integer pre_expand_value_sets_max_count = 1000;
 	private Integer maximum_expansion_size = 1000;
+	private JpaStorageSettings.StoreMetaSourceInformationEnum store_meta_source_information =
+			JpaStorageSettings.StoreMetaSourceInformationEnum.NONE;
 
 	private Map<String, RemoteSystem> remote_terminology_service = null;
 
@@ -284,6 +288,14 @@ public class AppProperties {
 		advanced_lucene_indexing = theAdvanced_lucene_indexing;
 	}
 
+	public boolean getSearch_index_full_text_enabled() {
+		return this.search_index_full_text_enabled;
+	}
+
+	public void setSearch_index_full_text_enabled(boolean theSearch_index_full_text_enabled) {
+		search_index_full_text_enabled = theSearch_index_full_text_enabled;
+	}
+
 	public Boolean getAllow_cascading_deletes() {
 		return allow_cascading_deletes;
 	}
@@ -733,6 +745,15 @@ public class AppProperties {
 		this.remote_terminology_service = remote_terminology_service;
 	}
 
+	public JpaStorageSettings.StoreMetaSourceInformationEnum getStore_meta_source_information() {
+		return store_meta_source_information;
+	}
+
+	public void setStore_meta_source_information(
+			JpaStorageSettings.StoreMetaSourceInformationEnum store_meta_source_information) {
+		this.store_meta_source_information = store_meta_source_information;
+	}
+
 	public static class Cors {
 		private Boolean allow_Credentials = true;
 		private List<String> allowed_origin = List.of("*");

src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCdsCrService.java

@@ -1,12 +1,11 @@
 package ca.uhn.fhir.jpa.starter.cdshooks;
 
 import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.repository.IRepository;
 import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.api.server.cdshooks.CdsServiceRequestJson;
-import ca.uhn.hapi.fhir.cdshooks.api.ICdsConfigService;
 import org.hl7.fhir.instance.model.api.IBaseParameters;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
-import org.opencds.cqf.fhir.api.Repository;
 import org.opencds.cqf.fhir.cr.hapi.cdshooks.CdsCrService;
 import org.opencds.cqf.fhir.utility.adapter.IAdapterFactory;
 
@@ -15,9 +14,8 @@ import static org.opencds.cqf.fhir.utility.Constants.APPLY_PARAMETER_DATA;
 public class UpdatedCdsCrService extends CdsCrService {
 	private final IAdapterFactory adapterFactory;
 
-	public UpdatedCdsCrService(
-			RequestDetails theRequestDetails, Repository theRepository, ICdsConfigService theCdsConfigService) {
-		super(theRequestDetails, theRepository, theCdsConfigService);
+	public UpdatedCdsCrService(RequestDetails theRequestDetails, IRepository theRepository) {
+		super(theRequestDetails, theRepository);
 		adapterFactory = IAdapterFactory.forFhirContext(theRepository.fhirContext());
 	}
 

src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCrDiscoveryService.java

@@ -1,11 +1,11 @@
 package ca.uhn.fhir.jpa.starter.cdshooks;
 
+import ca.uhn.fhir.repository.IRepository;
 import org.hl7.fhir.instance.model.api.IIdType;
-import org.opencds.cqf.fhir.api.Repository;
 import org.opencds.cqf.fhir.cr.hapi.cdshooks.discovery.CrDiscoveryService;
 
 public class UpdatedCrDiscoveryService extends CrDiscoveryService {
-	public UpdatedCrDiscoveryService(IIdType thePlanDefinitionId, Repository theRepository) {
+	public UpdatedCrDiscoveryService(IIdType thePlanDefinitionId, IRepository theRepository) {
 		super(thePlanDefinitionId, theRepository);
 		maxUriLength = 6000;
 	}

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

@@ -201,6 +201,7 @@ public class FhirServerConfigCommon {
 
 		jpaStorageSettings.setFilterParameterEnabled(appProperties.getFilter_search_enabled());
 		jpaStorageSettings.setHibernateSearchIndexSearchParams(appProperties.getAdvanced_lucene_indexing());
+		jpaStorageSettings.setHibernateSearchIndexFullText(appProperties.getSearch_index_full_text_enabled());
 		jpaStorageSettings.setTreatBaseUrlsAsLocal(new HashSet<>(appProperties.getLocal_base_urls()));
 		jpaStorageSettings.setTreatReferencesAsLogical(new HashSet<>(appProperties.getLogical_urls()));
 
@@ -253,6 +254,10 @@ public class FhirServerConfigCommon {
 		jpaStorageSettings.setBundleBatchPoolSize(appProperties.getBundle_batch_pool_size());
 		jpaStorageSettings.setBundleBatchPoolSize(appProperties.getBundle_batch_pool_max_size());
 
+		// Set store meta source information
+		ourLog.debug("Server configured to Store Meta Source: {}", appProperties.getStore_meta_source_information());
+		jpaStorageSettings.setStoreMetaSourceInformation(appProperties.getStore_meta_source_information());
+
 		storageSettings(appProperties, jpaStorageSettings);
 		return jpaStorageSettings;
 	}

src/main/resources/application.yaml

@@ -200,6 +200,7 @@ 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
+    search_index_full_text_enabled: false
     bulk_export_enabled: false
     bulk_import_enabled: false
     #    language_search_parameter_enabled: true
@@ -275,7 +276,8 @@ hapi:
     # classes listed here will be fetched from the Spring context when combined with 'custom-bean-packages', 
     # or will be instantiated via reflection using an no-arg contructor; then registered with the server  
     #custom-provider-classes:  
-    
+    # specify what should be stored in meta.source based on StoreMetaSourceInformationEnum defaults to NONE
+    # store_meta_source_information: NONE
     # Threadpool size for BATCH'ed GETs in a bundle.
     #    bundle_batch_pool_size: 10
     #    bundle_batch_pool_max_size: 50

src/main/resources/cds.application.yaml

@@ -196,6 +196,7 @@ 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
+    search_index_full_text_enabled: false
     bulk_export_enabled: false
     bulk_import_enabled: false
     #    language_search_parameter_enabled: true

src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java

@@ -52,6 +52,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
     "hapi.fhir.lastn_enabled=true",
 	 "hapi.fhir.store_resource_in_lucene_index_enabled=true",
 	 "hapi.fhir.advanced_lucene_indexing=true",
+	 "hapi.fhir.search_index_full_text_enabled=true",
 
     "elasticsearch.enabled=true",
 	  "hapi.fhir.cr_enabled=false",

src/test/resources/application.yaml

@@ -129,6 +129,7 @@ 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
+    search_index_full_text_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