Merge pull request #20704 from johtani/remove_request_params_in_analyze_api

Removing request parameters in _analyze API

8 files changed, 58 insertions, 41 deletions

diff --git a/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yaml b/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yaml
index 64fbbcadf7..180f6c6f5b 100644
--- a/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yaml
+++ b/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yaml
@@ -3,8 +3,9 @@
 "Tokenizer":
     - do:
         indices.analyze:
-          text:         Foo Bar
-          tokenizer:    icu_tokenizer
+          body:
+            text:         Foo Bar
+            tokenizer:    icu_tokenizer
     - length: { tokens: 2 }
     - match:  { tokens.0.token: Foo }
     - match:  { tokens.1.token: Bar }
@@ -12,26 +13,29 @@
 "Normalization filter":
     - do:
         indices.analyze:
-          filter:      icu_normalizer
-          text:         Foo Bar Ruß
-          tokenizer:    keyword
+          body:
+            filter:       [icu_normalizer]
+            text:         Foo Bar Ruß
+            tokenizer:    keyword
     - length: { tokens: 1 }
     - match:  { tokens.0.token: foo bar russ }
 ---
 "Normalization charfilter":
     - do:
         indices.analyze:
-          char_filter: icu_normalizer
-          text:         Foo Bar Ruß
-          tokenizer:    keyword
+          body:
+            char_filter:  [icu_normalizer]
+            text:         Foo Bar Ruß
+            tokenizer:    keyword
     - length: { tokens: 1 }
     - match:  { tokens.0.token: foo bar russ }
 ---
 "Folding filter":
     - do:
         indices.analyze:
-          filter:      icu_folding
-          text:         Foo Bar résumé
-          tokenizer:    keyword
+          body:
+            filter:       [icu_folding]
+            text:         Foo Bar résumé
+            tokenizer:    keyword
     - length: { tokens: 1 }
     - match:  { tokens.0.token: foo bar resume }
diff --git a/plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/10_basic.yaml b/plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/10_basic.yaml
index 42df558567..1cca2b728e 100644
--- a/plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/10_basic.yaml
+++ b/plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/10_basic.yaml
@@ -4,8 +4,9 @@
 "Analyzer":
     - do:
         indices.analyze:
-          text:         JR新宿駅の近くにビールを飲みに行こうか
-          analyzer:     kuromoji
+          body:
+            text:         JR新宿駅の近くにビールを飲みに行こうか
+            analyzer:     kuromoji
     - length: { tokens: 7 }
     - match:  { tokens.0.token: jr }
     - match:  { tokens.1.token: 新宿 }
@@ -18,8 +19,9 @@
 "Tokenizer":
     - do:
         indices.analyze:
-          text:         関西国際空港
-          tokenizer:    kuromoji_tokenizer
+          body:
+            text:         関西国際空港
+            tokenizer:    kuromoji_tokenizer
     - length: { tokens: 4 }
     - match:  { tokens.0.token: 関西 }
     - match:  { tokens.1.token: 関西国際空港 }
@@ -29,26 +31,29 @@
 "Baseform filter":
     - do:
         indices.analyze:
-          text:         飲み
-          tokenizer:    kuromoji_tokenizer
-          filter:      kuromoji_baseform
+          body:
+            text:         飲み
+            tokenizer:    kuromoji_tokenizer
+            filter:       [kuromoji_baseform]
     - length: { tokens: 1 }
     - match:  { tokens.0.token: 飲む }
 ---
 "Reading filter":
     - do:
         indices.analyze:
-          text:         寿司
-          tokenizer:    kuromoji_tokenizer
-          filter:      kuromoji_readingform
+          body:
+            text:         寿司
+            tokenizer:    kuromoji_tokenizer
+            filter:       [kuromoji_readingform]
     - length: { tokens: 1 }
     - match:  { tokens.0.token: スシ }
 ---
 "Stemming filter":
     - do:
         indices.analyze:
-          text:         サーバー
-          tokenizer:    kuromoji_tokenizer
-          filter:      kuromoji_stemmer
+          body:
+            text:         サーバー
+            tokenizer:    kuromoji_tokenizer
+            filter:       [kuromoji_stemmer]
     - length: { tokens: 1 }
     - match:  { tokens.0.token: サーバ }
diff --git a/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/10_metaphone.yaml b/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/10_metaphone.yaml
index 02d4b315b6..1f326fe377 100644
--- a/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/10_metaphone.yaml
+++ b/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/10_metaphone.yaml
@@ -22,8 +22,9 @@
     - do:
         indices.analyze:
             index: phonetic_sample
-            analyzer: my_analyzer
-            text: Joe Bloggs
+            body:
+                analyzer: my_analyzer
+                text: Joe Bloggs
 
     - length: { tokens: 4 }
     - match:  { tokens.0.token: J  }
diff --git a/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/20_double_metaphone.yaml b/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/20_double_metaphone.yaml
index 675847e557..5af9f48aa8 100644
--- a/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/20_double_metaphone.yaml
+++ b/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/20_double_metaphone.yaml
@@ -22,8 +22,9 @@
     - do:
         indices.analyze:
             index: phonetic_sample
-            analyzer: my_analyzer
-            text: supercalifragilisticexpialidocious
+            body:
+                analyzer: my_analyzer
+                text: supercalifragilisticexpialidocious
 
     - length: { tokens: 1 }
     - match:  { tokens.0.token: SPRKLF }
diff --git a/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/30_beider_morse.yaml b/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/30_beider_morse.yaml
index 015610af17..259b0adea7 100644
--- a/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/30_beider_morse.yaml
+++ b/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/30_beider_morse.yaml
@@ -24,8 +24,9 @@
     - do:
         indices.analyze:
             index: phonetic_sample
-            analyzer: my_analyzer
-            text: Szwarc
+            body:
+                analyzer: my_analyzer
+                text: Szwarc
 
     - length: { tokens: 1 }
     - match:  { tokens.0.token: Svarts }
diff --git a/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/50_daitch_mokotoff.yaml b/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/50_daitch_mokotoff.yaml
index 5125ae3d68..c67b6892bc 100644
--- a/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/50_daitch_mokotoff.yaml
+++ b/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/50_daitch_mokotoff.yaml
@@ -21,8 +21,9 @@
     - do:
         indices.analyze:
             index: phonetic_sample
-            analyzer: my_analyzer
-            text: Moskowitz
+            body:
+                analyzer: my_analyzer
+                text: Moskowitz
 
     - length: { tokens: 1 }
     - match:  { tokens.0.token: "645740" }
diff --git a/plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/10_basic.yaml b/plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/10_basic.yaml
index 2549f774f8..0f1b2805c9 100644
--- a/plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/10_basic.yaml
+++ b/plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/10_basic.yaml
@@ -3,8 +3,9 @@
 "Tokenizer":
     - do:
         indices.analyze:
-          text:         我购买了道具和服装。
-          tokenizer:    smartcn_tokenizer
+          body:
+            text:         我购买了道具和服装。
+            tokenizer:    smartcn_tokenizer
     - length: { tokens: 7 }
     - match:  { tokens.0.token: 我  }
     - match:  { tokens.1.token: 购买 }
@@ -17,8 +18,9 @@
 "Analyzer":
     - do:
         indices.analyze:
-          text:         我购买了道具和服装。
-          analyzer:     smartcn
+          body:
+            text:         我购买了道具和服装。
+            analyzer:     smartcn
     - length: { tokens: 6 }
     - match:  { tokens.0.token: 我  }
     - match:  { tokens.1.token: 购买 }
diff --git a/plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/10_basic.yaml b/plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/10_basic.yaml
index f87f00b792..1941126c64 100644
--- a/plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/10_basic.yaml
+++ b/plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/10_basic.yaml
@@ -3,16 +3,18 @@
 "Stemmer":
     - do:
         indices.analyze:
-          text:         studenci
-          tokenizer:    keyword
-          filter:      polish_stem
+          body:
+            text:         studenci
+            tokenizer:    keyword
+            filter:       [polish_stem]
     - length: { tokens: 1 }
     - match:  { tokens.0.token: student  }
 ---
 "Analyzer":
     - do:
         indices.analyze:
-          text:         studenta był
-          analyzer:     polish
+          body:
+            text:         studenta był
+            analyzer:     polish
     - length: { tokens: 1 }
     - match:  { tokens.0.token: student  }