Add deprecation log for delimited_payload_filter

Author: liketic

core/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java

@@ -27,7 +27,6 @@
 import org.elasticsearch.common.logging.DeprecationLogger;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.util.set.Sets;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexSettings;
@@ -42,7 +41,6 @@
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
@@ -53,6 +51,8 @@
  * This class exists per node and allows to create per-index {@link IndexAnalyzers} via {@link #build(IndexSettings)}
  */
 public final class AnalysisRegistry implements Closeable {
+    private static final DeprecationLogger DEPRECATION_LOGGER = new DeprecationLogger(Loggers.getLogger(AnalysisRegistry.class));
+
     public static final String INDEX_ANALYSIS_CHAR_FILTER = "index.analysis.char_filter";
     public static final String INDEX_ANALYSIS_FILTER = "index.analysis.filter";
     public static final String INDEX_ANALYSIS_TOKENIZER = "index.analysis.tokenizer";
@@ -384,6 +384,9 @@ private <T> AnalysisProvider<T> getAnalysisProvider(Component component, Map<Str
         if (typeName == null) {
             throw new IllegalArgumentException(component + " [" + name + "] must specify either an analyzer type, or a tokenizer");
         }
+        if ("delimited_payload_filter".equals(typeName)) {
+            DEPRECATION_LOGGER.deprecated("Deprecated [delimited_payload_filter] used, replaced by [delimited_payload]");
+        }
         AnalysisProvider<T> type = providerMap.get(typeName);
         if (type == null) {
             throw new IllegalArgumentException("Unknown " + component + " type [" + typeName + "] for [" + name + "]");
@@ -421,6 +424,9 @@ public AnalysisModule.AnalysisProvider<CharFilterFactory> getCharFilterFactory(S
         }
 
         public AnalysisModule.AnalysisProvider<TokenFilterFactory> getTokenFilterFactory(String name) {
+            if ("delimited_payload_filter".equals(name)) {
+                DEPRECATION_LOGGER.deprecated("Deprecated [delimited_payload_filter] used, replaced by [delimited_payload]");
+            }
             return preConfiguredTokenFilters.get(name);
         }
 

modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CommonAnalysisPlugin.java

@@ -103,7 +103,6 @@ public Map<String, AnalysisProvider<TokenFilterFactory>> getTokenFilters() {
         filters.put("czech_stem", CzechStemTokenFilterFactory::new);
         filters.put("common_grams", requriesAnalysisSettings(CommonGramsTokenFilterFactory::new));
         filters.put("decimal_digit", DecimalDigitFilterFactory::new);
-        // TODO deprecate delimited_payload_filter
         filters.put("delimited_payload_filter", DelimitedPayloadTokenFilterFactory::new);
         filters.put("delimited_payload", DelimitedPayloadTokenFilterFactory::new);
         filters.put("dictionary_decompounder", requriesAnalysisSettings(DictionaryCompoundWordTokenFilterFactory::new));

modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisFactoryTests.java

@@ -169,7 +169,6 @@ protected Map<String, Class<?>> getPreConfiguredTokenFilters() {
         filters.put("common_grams", null);
         filters.put("czech_stem", null);
         filters.put("decimal_digit", null);
-        // TODO deprecate delimited_payload_filter
         filters.put("delimited_payload_filter", org.apache.lucene.analysis.payloads.DelimitedPayloadTokenFilterFactory.class);
         filters.put("delimited_payload", org.apache.lucene.analysis.payloads.DelimitedPayloadTokenFilterFactory.class);
         filters.put("dutch_stem", SnowballPorterFilterFactory.class);

modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yml

@@ -1026,9 +1026,15 @@
     - match:  { tokens.10.token: ちた }
 
 ---
-# Deprecate delimited_payload_filter
 "delimited_payload_filter":
+    - skip:
+        version: " - 6.99.99"
+        reason:  delimited_payload_filter deprecated in 7.0, replaced by delimited_payload
+        features: "warnings"
+
     - do:
+        warnings:
+          - "Deprecated [delimited_payload_filter] used, replaced by [delimited_payload]"
         indices.create:
           index: test
           body:
@@ -1040,6 +1046,8 @@
                     delimiter: ^
                     encoding: identity
     - do:
+        warnings:
+          - "Deprecated [delimited_payload_filter] used, replaced by [delimited_payload]"
         indices.analyze:
           index: test
           body:
@@ -1051,6 +1059,8 @@
 
     # Test pre-configured token filter too:
     - do:
+        warnings:
+          - "Deprecated [delimited_payload_filter] used, replaced by [delimited_payload]"
         indices.analyze:
           body:
             text:      foo|5