UPdate to support new HS6 changes

README.md

@@ -328,9 +328,10 @@ For example:
 
 ```properties
 elasticsearch.enabled=true
-elasticsearch.rest_url=http://localhost:9200
+elasticsearch.rest_url=localhost:9200
 elasticsearch.username=SomeUsername
 elasticsearch.password=SomePassword
+elasticsearch.protocol=http
 elasticsearch.required_index_status=YELLOW
 elasticsearch.schema_management_strategy=CREATE
 ```

pom.xml

@@ -233,6 +233,21 @@
             <artifactId>jetty-webapp</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
 
 
         <!--

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

@@ -1,8 +1,15 @@
 package ca.uhn.fhir.jpa.starter;
 
+import ca.uhn.fhir.jpa.search.HapiLuceneAnalysisConfigurer;
 import ca.uhn.fhir.jpa.search.elastic.ElasticsearchHibernatePropertiesBuilder;
-import org.hibernate.search.elasticsearch.cfg.ElasticsearchIndexStatus;
-import org.hibernate.search.elasticsearch.cfg.IndexSchemaManagementStrategy;
+import org.elasticsearch.action.admin.indices.stats.IndexStats;
+import org.hibernate.search.backend.elasticsearch.index.IndexStatus;
+import org.hibernate.search.backend.lucene.cfg.LuceneBackendSettings;
+import org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings;
+import org.hibernate.search.engine.cfg.BackendSettings;
+import org.hibernate.search.mapper.orm.automaticindexing.session.AutomaticIndexingSynchronizationStrategyNames;
+import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings;
+import org.hibernate.search.mapper.orm.schema.management.SchemaManagementStrategyName;
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.EnumerablePropertySource;
@@ -19,7 +26,6 @@ public class EnvironmentHelper {
     Properties properties = new Properties();
 
     if (environment.getProperty("spring.jpa.properties", String.class) == null) {
-      properties.put("hibernate.search.model_mapping", "ca.uhn.fhir.jpa.search.LuceneSearchMappingFactory");
       properties.put("hibernate.format_sql", "false");
       properties.put("hibernate.show_sql", "false");
       properties.put("hibernate.hbm2ddl.auto", "update");
@@ -28,9 +34,14 @@ public class EnvironmentHelper {
       properties.put("hibernate.cache.use_second_level_cache", "false");
       properties.put("hibernate.cache.use_structured_entries", "false");
       properties.put("hibernate.cache.use_minimal_puts", "false");
-      properties.put("hibernate.search.default.directory_provider", "filesystem");
-      properties.put("hibernate.search.default.indexBase", "target/lucenefiles");
-      properties.put("hibernate.search.lucene_version", "LUCENE_CURRENT");
+
+		properties.put(BackendSettings.backendKey(LuceneIndexSettings.DIRECTORY_TYPE), "local-filesystem");
+		properties.put(BackendSettings.backendKey(LuceneIndexSettings.DIRECTORY_ROOT), "target/lucenefiles");
+		properties.put(BackendSettings.backendKey(BackendSettings.TYPE), "lucene");
+		properties.put(BackendSettings.backendKey(LuceneBackendSettings.ANALYSIS_CONFIGURER), HapiLuceneAnalysisConfigurer.class.getName());
+		properties.put(BackendSettings.backendKey(LuceneBackendSettings.LUCENE_VERSION), "LUCENE_CURRENT");
+		properties.put(HibernateOrmMapperSettings.ENABLED, "true");
+
     } else {
       Arrays.asList(environment.getProperty("spring.jpa.properties", String.class).split(" ")).stream().forEach(s ->
       {
@@ -42,9 +53,9 @@ public class EnvironmentHelper {
     if (environment.getProperty("elasticsearch.enabled", Boolean.class) != null
           && environment.getProperty("elasticsearch.enabled", Boolean.class) == true ){
       ElasticsearchHibernatePropertiesBuilder builder = new ElasticsearchHibernatePropertiesBuilder();
-      ElasticsearchIndexStatus requiredIndexStatus = environment.getProperty("elasticsearch.required_index_status", ElasticsearchIndexStatus.class);
+      IndexStatus requiredIndexStatus = environment.getProperty("elasticsearch.required_index_status", IndexStatus.class);
       if (requiredIndexStatus == null) {
-        builder.setRequiredIndexStatus(ElasticsearchIndexStatus.YELLOW);
+        builder.setRequiredIndexStatus(IndexStatus.YELLOW);
       } else {
         builder.setRequiredIndexStatus(requiredIndexStatus);
       }
@@ -52,18 +63,19 @@ public class EnvironmentHelper {
       builder.setRestUrl(getElasticsearchServerUrl(environment));
       builder.setUsername(getElasticsearchServerUsername(environment));
       builder.setPassword(getElasticsearchServerPassword(environment));
-      IndexSchemaManagementStrategy indexSchemaManagementStrategy = environment.getProperty("elasticsearch.schema_management_strategy", IndexSchemaManagementStrategy.class);
+		builder.setProtocol(getElasticsearchServerProtocol(environment));
+		 SchemaManagementStrategyName indexSchemaManagementStrategy = environment.getProperty("elasticsearch.schema_management_strategy", SchemaManagementStrategyName.class);
       if (indexSchemaManagementStrategy == null) {
-        builder.setIndexSchemaManagementStrategy(IndexSchemaManagementStrategy.CREATE);
+        builder.setIndexSchemaManagementStrategy(SchemaManagementStrategyName.CREATE);
       } else {
         builder.setIndexSchemaManagementStrategy(indexSchemaManagementStrategy);
       }
       //    pretty_print_json_log: false
       Boolean refreshAfterWrite = environment.getProperty("elasticsearch.debug.refresh_after_write", Boolean.class);
-      if (refreshAfterWrite == null) {
-        builder.setDebugRefreshAfterWrite(false);
+      if (refreshAfterWrite == null || refreshAfterWrite == false) {
+      	builder.setDebugIndexSyncStrategy(AutomaticIndexingSynchronizationStrategyNames.ASYNC);
       } else {
-        builder.setDebugRefreshAfterWrite(refreshAfterWrite);
+			builder.setDebugIndexSyncStrategy(AutomaticIndexingSynchronizationStrategyNames.READ_SYNC);
       }
       //    pretty_print_json_log: false
       Boolean prettyPrintJsonLog = environment.getProperty("elasticsearch.debug.pretty_print_json_log", Boolean.class);
@@ -74,7 +86,6 @@ public class EnvironmentHelper {
       }
       builder.apply(properties);
     }
-
     return properties;
   }
 
@@ -82,6 +93,10 @@ public class EnvironmentHelper {
     return environment.getProperty("elasticsearch.rest_url", String.class);
   }
 
+	public static String getElasticsearchServerProtocol(ConfigurableEnvironment environment) {
+		return environment.getProperty("elasticsearch.protocol", String.class, "http");
+	}
+
 	public static String getElasticsearchServerUsername(ConfigurableEnvironment environment) {
     return environment.getProperty("elasticsearch.username");
   }

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

@@ -3,7 +3,7 @@ package ca.uhn.fhir.jpa.starter;
 import ca.uhn.fhir.jpa.api.config.DaoConfig;
 import ca.uhn.fhir.jpa.binstore.DatabaseBlobBinaryStorageSvcImpl;
 import ca.uhn.fhir.jpa.binstore.IBinaryStorageSvc;
-import ca.uhn.fhir.jpa.config.HibernateDialectProvider;
+import ca.uhn.fhir.jpa.config.HibernatePropertiesProvider;
 import ca.uhn.fhir.jpa.model.config.PartitionSettings;
 import ca.uhn.fhir.jpa.model.entity.ModelConfig;
 import ca.uhn.fhir.jpa.subscription.channel.subscription.SubscriptionDeliveryHandlerFactory;
@@ -141,8 +141,8 @@ public class FhirServerConfigCommon {
 
   @Primary
   @Bean
-  public HibernateDialectProvider jpaStarterDialectProvider(LocalContainerEntityManagerFactoryBean myEntityManagerFactory) {
-    return new JpaHibernateDialectProvider(myEntityManagerFactory);
+  public HibernatePropertiesProvider jpaStarterDialectProvider(LocalContainerEntityManagerFactoryBean myEntityManagerFactory) {
+    return new JpaHibernatePropertiesProvider(myEntityManagerFactory);
   }
 
   @Bean

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

@@ -71,7 +71,13 @@ public class FhirServerConfigR4 extends BaseJavaConfigR4 {
   public ElasticsearchSvcImpl elasticsearchSvc() {
     if (EnvironmentHelper.isElasticsearchEnabled(configurableEnvironment)) {
 		 String elasticsearchUrl = EnvironmentHelper.getElasticsearchServerUrl(configurableEnvironment);
-      String elasticsearchHost = elasticsearchUrl.substring(elasticsearchUrl.indexOf("://")+3, elasticsearchUrl.lastIndexOf(":"));
+		 String elasticsearchHost;
+		 if (elasticsearchUrl.startsWith("http")) {
+			 elasticsearchHost = elasticsearchUrl.substring(elasticsearchUrl.indexOf("://") + 3, elasticsearchUrl.lastIndexOf(":"));
+		 } else {
+			 elasticsearchHost = elasticsearchUrl.substring(0, elasticsearchUrl.indexOf(":"));
+		 }
+
       String elasticsearchUsername = EnvironmentHelper.getElasticsearchServerUsername(configurableEnvironment);
       String elasticsearchPassword = EnvironmentHelper.getElasticsearchServerPassword(configurableEnvironment);
       int elasticsearchPort = Integer.parseInt(elasticsearchUrl.substring(elasticsearchUrl.lastIndexOf(":")+1));

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

@@ -1,7 +1,7 @@
 package ca.uhn.fhir.jpa.starter;
 
 import ca.uhn.fhir.context.ConfigurationException;
-import ca.uhn.fhir.jpa.config.HibernateDialectProvider;
+import ca.uhn.fhir.jpa.config.HibernatePropertiesProvider;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.dialect.internal.StandardDialectResolver;
 import org.hibernate.engine.jdbc.dialect.spi.DatabaseMetaDataDialectResolutionInfoAdapter;
@@ -10,11 +10,11 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import javax.sql.DataSource;
 import java.sql.SQLException;
 
-public class JpaHibernateDialectProvider extends HibernateDialectProvider {
+public class JpaHibernatePropertiesProvider extends HibernatePropertiesProvider {
 
   private final Dialect dialect;
 
-  public JpaHibernateDialectProvider(LocalContainerEntityManagerFactoryBean myEntityManagerFactory) {
+  public JpaHibernatePropertiesProvider(LocalContainerEntityManagerFactoryBean myEntityManagerFactory) {
     DataSource connection = myEntityManagerFactory.getDataSource();
     try {
       dialect = new StandardDialectResolver()

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

@@ -26,11 +26,13 @@ import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
-import pl.allegro.tech.embeddedelasticsearch.EmbeddedElastic;
-import pl.allegro.tech.embeddedelasticsearch.PopularProperties;
+import org.testcontainers.elasticsearch.ElasticsearchContainer;
+import org.testcontainers.junit.jupiter.Container;
 
 import javax.annotation.PreDestroy;
 import java.io.IOException;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.UUID;
@@ -49,7 +51,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
     // Because the port is set randomly, we will set the rest_url using the Initializer.
     // "elasticsearch.rest_url='http://localhost:9200'",
     "elasticsearch.username=SomeUsername",
-    "elasticsearch.password=SomePassword"
+    "elasticsearch.password=SomePassword",
+	 "elasticsearch.protocol=http"
   })
 @ContextConfiguration(initializers = ElasticsearchLastNR4IT.Initializer.class)
 public class ElasticsearchLastNR4IT {
@@ -57,28 +60,18 @@ public class ElasticsearchLastNR4IT {
   private IGenericClient ourClient;
   private FhirContext ourCtx;
 
-  private static final String ELASTIC_VERSION = "6.5.4";
-  private static EmbeddedElastic embeddedElastic;
+  private static final String ELASTIC_VERSION = "7.10.0";
+	private static final String ELASTIC_IMAGE = "docker.elastic.co/elasticsearch/elasticsearch:" + ELASTIC_VERSION;
+
+	private static ElasticsearchContainer embeddedElastic;
 
   @Autowired
   private ElasticsearchSvcImpl myElasticsearchSvc;
 
   @BeforeAll
   public static void beforeClass() {
-
-    embeddedElastic = null;
-    try {
-      embeddedElastic = EmbeddedElastic.builder()
-        .withElasticVersion(ELASTIC_VERSION)
-        .withSetting(PopularProperties.TRANSPORT_TCP_PORT, 0)
-        .withSetting(PopularProperties.HTTP_PORT, 0)
-        .withSetting(PopularProperties.CLUSTER_NAME, UUID.randomUUID())
-        .withStartTimeout(60, TimeUnit.SECONDS)
-        .build()
-        .start();
-    } catch (IOException | InterruptedException e) {
-      throw new ConfigurationException(e);
-    }
+	  embeddedElastic = new ElasticsearchContainer(ELASTIC_IMAGE).withStartupTimeout(Duration.of(300, ChronoUnit.SECONDS));
+	  embeddedElastic.start();
   }
   
   @PreDestroy
@@ -136,7 +129,7 @@ public class ElasticsearchLastNR4IT {
     public void initialize(
       ConfigurableApplicationContext configurableApplicationContext) {
       // Since the port is dynamically generated, replace the URL with one that has the correct port
-      TestPropertyValues.of("elasticsearch.rest_url=http://localhost:" + embeddedElastic.getHttpPort())
+      TestPropertyValues.of("elasticsearch.rest_url=" + embeddedElastic.getHost() +":" + embeddedElastic.getMappedPort(9200))
         .applyTo(configurableApplicationContext.getEnvironment());
     }