Merge remote-tracking branch 'hapi/rel_5_4_0' into search-coord-thread-pool

Conflicts:
	pom.xml

pom.xml

@@ -15,7 +15,7 @@
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
         <!-- FIMXME KBD Change this to 5.3.0 BEFORE merging this code to master !  -->
-        <version>5.4.0-PRE1-SNAPSHOT</version>
+        <version>5.4.0-PRE2-SNAPSHOT</version>
     </parent>
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>

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

@@ -31,6 +31,7 @@ public class AppProperties {
   private Boolean allow_placeholder_references = true;
   private Boolean auto_create_placeholder_reference_targets = false;
   private Boolean enable_index_missing_fields = false;
+  private Boolean enable_index_contained_resource = false;
   private Boolean enable_repository_validating_interceptor = false;
   private Boolean enforce_referential_integrity_on_delete = true;
   private Boolean enforce_referential_integrity_on_write = true;
@@ -276,6 +277,14 @@ public class AppProperties {
     this.enable_index_missing_fields = enable_index_missing_fields;
   }
 
+	public Boolean getEnable_index_contained_resource() {
+		return enable_index_contained_resource;
+	}
+
+	public void setEnable_index_contained_resource(Boolean enable_index_contained_resource) {
+		this.enable_index_contained_resource = enable_index_contained_resource;
+	}
+
 	public Boolean getEnable_repository_validating_interceptor() {
 		return enable_repository_validating_interceptor;
 	}

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

@@ -384,5 +384,7 @@ public class BaseJpaRestfulServer extends RestfulServer {
     }
 
     daoConfig.getModelConfig().setNormalizedQuantitySearchLevel(appProperties.getNormalized_quantity_search_level());
+    
+    daoConfig.getModelConfig().setIndexOnContainedResources(appProperties.getEnable_index_contained_resource());
   }
 }

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

@@ -183,4 +183,4 @@ public class EnvironmentHelper {
 			aBase.put(entry.getKey(), entry.getValue());
 		}
 	}
-}
+}

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

@@ -61,6 +61,10 @@ public class FhirServerConfigCommon {
     if (appProperties.getSubscription().getEmail() != null) {
       ourLog.info("Email subscriptions enabled");
     }
+    
+    if (appProperties.getEnable_index_contained_resource() == Boolean.TRUE) {
+        ourLog.info("Indexed on contained resource enabled");
+      }
   }
 
   /**
@@ -163,6 +167,8 @@ public class FhirServerConfigCommon {
     }
 
     modelConfig.setNormalizedQuantitySearchLevel(appProperties.getNormalized_quantity_search_level());
+    
+    modelConfig.setIndexOnContainedResources(appProperties.getEnable_index_contained_resource());
     return modelConfig;
   }
 

src/main/resources/application.yaml

@@ -74,6 +74,7 @@ hapi:
 #    default_page_size: 20
 #    enable_repository_validating_interceptor: false
 #    enable_index_missing_fields: false
+#    enable_index_contained_resource: false
 #    enforce_referential_integrity_on_delete: false
 #    enforce_referential_integrity_on_write: false
 #    etag_support_enabled: true

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

@@ -60,7 +60,7 @@ public class ElasticsearchLastNR4IT {
   private IGenericClient ourClient;
   private FhirContext ourCtx;
 
-  private static final String ELASTIC_VERSION = "7.10.1";
+  private static final String ELASTIC_VERSION = "7.10.2";
 	private static final String ELASTIC_IMAGE = "docker.elastic.co/elasticsearch/elasticsearch:" + ELASTIC_VERSION;
 
 	private static ElasticsearchContainer embeddedElastic;