Add credit for #798 and fix broken test

hapifhir · Mar 15, 2018 · 83b1cf5 · 83b1cf5
1 parent 84e606c
commit 83b1cf5
Show file tree

Hide file tree

Showing 4 changed files with 133 additions and 332 deletions.
diff --git a/hapi-fhir-jpaserver-elasticsearch/pom.xml b/hapi-fhir-jpaserver-elasticsearch/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.3.0-SNAPSHOT</version>
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
 

diff --git a/...-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/elasticsearch/FhirServerConfig.java b/...-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/elasticsearch/FhirServerConfig.java
@@ -12,6 +12,7 @@
 import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor;
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.hibernate.jpa.HibernatePersistenceProvider;
+import org.hibernate.search.elasticsearch.cfg.ElasticsearchEnvironment;
 import org.springframework.beans.factory.annotation.Autowire;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -76,7 +77,7 @@ private Properties jpaProperties() {
 		extraProperties.put("hibernate.cache.use_minimal_puts", "false");
 
 		// the belowing properties are used for ElasticSearch integration
-		extraProperties.put("hibernate.search.elasticsearch.analyzer_definition_provider", ElasticsearchMappingProvider.class.getName());
+		extraProperties.put(ElasticsearchEnvironment.ANALYZER_DEFINITION_PROVIDER, ElasticsearchMappingProvider.class.getName());
 		extraProperties.put("hibernate.search.default.indexmanager", "elasticsearch");
 		extraProperties.put("hibernate.search.default.elasticsearch.host", "http://127.0.0.1:9200");
 		extraProperties.put("hibernate.search.default.elasticsearch.index_schema_management_strategy", "CREATE");