HSEARCH-2219 Remove most of the custom analyzer definitions from elasticsearch.yml

They are not needed anymore, since we push those definitions
automatically.

Author: yrodiere

elasticsearch/elasticsearchconfiguration/elasticsearch.yml

@@ -53,75 +53,14 @@ index.number_of_replicas: 0
 script.engine.groovy.inline.search: on
 
 # Custom analyzer used in tests
+# See ElasticsearchAnalyzerIT
 index.analysis:
   analyzer:
-    custom-analyzer:
+    server-defined-custom-analyzer:
       type: custom
       tokenizer: standard
-      filter: [custom-filter, lowercase]
-    stemmer:
-      type: custom
-      tokenizer: standard
-      filter: [lowercase, stopWordsDefaultEnglish, snowballEnglish]
-    ngram:
-      type: custom
-      tokenizer: standard
-      filter: [lowercase, stopWordsDefaultEnglish, ngram3]
-    htmlStrip:
-      type: custom
-      tokenizer: standard
-      filter: [lowercase]
-      char_filter: htmlStrip
-    org_hibernate_search_test_configuration_BlogEntry_en:
-      type: custom
-      tokenizer: standard
-      filter: [lowercase, snowballEnglish]
-    org_hibernate_search_test_configuration_BlogEntry_de:
-      type: custom
-      tokenizer: standard
-      filter: [lowercase, stemGerman]
-    org_hibernate_search_test_configuration_ProgrammaticSearchMappingFactory_ngram:
-      type: custom
-      tokenizer: standard
-      filter: [lowercase, ngram3]
-    org_hibernate_search_test_configuration_ProgrammaticSearchMappingFactory_english:
-      type: custom
-      tokenizer: standard
-      filter: [lowercase, snowballEnglish]
-    org_hibernate_search_test_configuration_ProgrammaticSearchMappingFactory_deutsch:
-      type: custom
-      tokenizer: standard
-      filter: [lowercase, stemGerman]
-    org_hibernate_search_test_query_facet_Car_collatingAnalyzer:
-      type: custom
-      tokenizer: keyword
-      filter: [asciifolding, lowercase]
-    org_hibernate_search_test_sorting_SortingTest_Person_collatingAnalyzer:
-      type: custom
-      tokenizer: keyword
-      filter: [asciifolding, lowercase]
-    org_hibernate_search_test_sorting_SortingTest_Person_tokenizingAnalyzer:
-      type: custom
-      tokenizer: whitespace
+      filter: [server-defined-custom-filter, lowercase]
   filter:
-    custom-filter:
+    server-defined-custom-filter:
       type : stop
       stopwords : [test1, close]
-    stopWordsDefaultEnglish:
-      type: stop
-      # default list of stop words. See org.apache.lucene.analysis.core.StopAnalyzer#ENGLISH_STOP_WORDS_SET
-      stopwords: [a, an, and, are, as, at, be, but, by, for, if, in, into, is, it, no, not, of, on, or, such, that, the, their, then, there, these, they, this, to, was, will, with]
-    ngram3:
-      type : nGram
-      min_gram: 3
-      max_gram: 3
-    snowballEnglish:
-      type: snowball
-      language: 'English'
-    stemGerman:
-      type : stemmer
-      name : 'german'
-  char_filter:
-    htmlStrip:
-      type: html_strip
-      escaped_tags: [escaped]

elasticsearch/src/test/java/org/hibernate/search/elasticsearch/test/ElasticsearchAnalyzerIT.java

@@ -22,6 +22,7 @@
 import org.hibernate.search.Search;
 import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.Analyzer;
+import org.hibernate.search.annotations.AnalyzerDef;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Fields;
 import org.hibernate.search.annotations.Indexed;
@@ -30,7 +31,8 @@
 import org.junit.Test;
 
 /**
- * Test the use of Elasticsearch built-in and custom analyzers.
+ * Test the use of Elasticsearch built-in and server-defined, custom analyzers,
+ * <strong>without</strong> using {@link AnalyzerDef}.
  *
  * @author Davide D'Alto
  */
@@ -161,12 +163,12 @@ public static class Tweet {
 
 		@Field
 		// Defined in the elasticsearch.yml configuration file
-		@Analyzer(definition = "custom-analyzer")
+		@Analyzer(definition = "server-defined-custom-analyzer")
 		private String customTweet;
 
 		@Fields({
 				@Field(name = "tweetNotAnalyzed", analyze = Analyze.NO, store = Store.YES),
-				@Field(name = "tweetWithCustom", analyzer = @Analyzer(definition = "custom-analyzer") ) })
+				@Field(name = "tweetWithCustom", analyzer = @Analyzer(definition = "server-defined-custom-analyzer") ) })
 		private String multipleTweets;
 
 		private String defaultAnalyzer;