HSEARCH-2434 Configure server-defined analyzers directly in tests ins…

…tead of doing so in elasticsearch.yml This is required for ES5, where analyzers cannot be configured in elasticsearch.yml.
hibernate · Mar 21, 2017 · 088e004 · 088e004
1 parent 6258e79
commit 088e004
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 13 deletions.
diff --git a/...search/src/test/java/org/hibernate/search/elasticsearch/test/ElasticsearchAnalyzerIT.java b/...search/src/test/java/org/hibernate/search/elasticsearch/test/ElasticsearchAnalyzerIT.java
@@ -26,9 +26,14 @@
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.Store;
+import org.hibernate.search.elasticsearch.testutil.TestElasticsearchClient;
 import org.hibernate.search.test.SearchTestBase;
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
+import com.google.gson.JsonParser;
+
 /**
  * Test the use of Elasticsearch built-in and server-defined, custom analyzers,
  * <strong>without</strong> using {@link AnalyzerDef}.
@@ -37,6 +42,43 @@
  */
 public class ElasticsearchAnalyzerIT extends SearchTestBase {
 
+	@Rule
+	public TestElasticsearchClient elasticsearchClient = new TestElasticsearchClient();
+
+	@Override
+	@Before
+	public void setUp() throws Exception {
+		// Make sure automatically created indexes will have the "server-defined-custom-analyzer" analyzer definition
+		elasticsearchClient.template( "server-defined-custom-analyzer" )
+				.create(
+						"*",
+						new JsonParser().parse(
+								"{"
+									+ "'index': {"
+										+ "'analysis': {"
+											+ "'analyzer': {"
+												+ "'server-defined-custom-analyzer': {"
+														+ "'char_filter': ['html_strip'],"
+														+ "'tokenizer': 'standard',"
+														+ "'filter': ['server-defined-custom-filter', 'lowercase']"
+												+ "}"
+											+ "},"
+											+ "'filter': {"
+												+ "'server-defined-custom-filter': {"
+														+ "'type': 'stop',"
+														+ "'stopwords': ['test1', 'close']"
+												+ "}"
+											+ "}"
+										+ "}"
+									+ "}"
+								+ "}"
+						)
+								.getAsJsonObject()
+					);
+
+		super.setUp();
+	}
+
 	@Test
 	public void testDefaultAnalyzer() throws Exception {
 		try ( Session session = openSession() ) {

diff --git a/elasticsearch/src/test/resources/elasticsearch/2.0/configuration/elasticsearch.yml b/elasticsearch/src/test/resources/elasticsearch/2.0/configuration/elasticsearch.yml
@@ -51,16 +51,3 @@ index.number_of_replicas: 0
 
 # Enable Groovy scripting support for search: useful for spatial queries
 script.engine.groovy.inline.search: on
-
-# Custom analyzer used in tests
-# See ElasticsearchAnalyzerIT
-index.analysis:
-  analyzer:
-    server-defined-custom-analyzer:
-      type: custom
-      tokenizer: standard
-      filter: [server-defined-custom-filter, lowercase]
-  filter:
-    server-defined-custom-filter:
-      type : stop
-      stopwords : [test1, close]