SONAR-7601 Remove usage of index_analyzer

diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/NewIndex.java b/server/sonar-server/src/main/java/org/sonar/server/es/NewIndex.java
index dfb01c8ff07f752c4f93fef27ac6b97efba6dd30..e8a6260e69c0008f2b7a7d8d25fe3b5bc21f0f8a 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/es/NewIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/es/NewIndex.java
@@ -218,7 +218,7 @@ public class NewIndex {
       addSubField(SEARCH_WORDS_SUFFIX, ImmutableSortedMap.of(
         "type", "string",
         "index", "analyzed",
-        "index_analyzer", "index_words",
+        "analyzer", "index_words",
         "search_analyzer", "search_words"));
       return this;
     }
@@ -230,7 +230,7 @@ public class NewIndex {
       addSubField(SEARCH_PARTIAL_SUFFIX, ImmutableSortedMap.of(
         "type", "string",
         "index", "analyzed",
-        "index_analyzer", "index_grams",
+        "analyzer", "index_grams",
         "search_analyzer", "search_grams"));
       return this;
     }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexDefinition.java b/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexDefinition.java
index b8a571303e1120689c4fee6af60592e9227c6ffb..1ac85f3a41f9e800c1ac2136973ecf92d9751f5a 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexDefinition.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexDefinition.java
@@ -91,7 +91,7 @@ public class UserIndexDefinition implements IndexDefinition {
     return ImmutableSortedMap.of(
       "type", "string",
       "index", "analyzed",
-      "index_analyzer", "index_ngrams",
+      "analyzer", "index_ngrams",
       "search_analyzer", "search_ngrams");
   }
 }