iter

Author: Christoph Büscher

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

@@ -176,8 +176,8 @@ public Map<String, AnalysisProvider<TokenizerFactory>> getTokenizers() {
     public List<PreConfiguredCharFilter> getPreConfiguredCharFilters() {
         List<PreConfiguredCharFilter> filters = new ArrayList<>();
         filters.add(PreConfiguredCharFilter.singleton("html_strip", false, HTMLStripCharFilter::new));
-        filters.add(PreConfiguredCharFilter.singleton("htmlStrip", false, (reader, version) -> {
-            if (version.onOrAfter(org.elasticsearch.Version.V_7_0_0_alpha1)) {
+        filters.add(PreConfiguredCharFilter.singletonWithVersion("htmlStrip", false, (reader, version) -> {
+            if (version.onOrAfter(org.elasticsearch.Version.V_6_3_0)) {
                 DEPRECATION_LOGGER.deprecatedAndMaybeLog("htmlStrip_deprecation",
                         "The [htmpStrip] char filter name is deprecated and will be removed in a future version. "
                                 + "Please change the filter name to [html_strip] instead.");

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

@@ -37,30 +37,30 @@
 public class HtmlStripCharFilterFactoryTests extends ESTestCase {
 
     /**
-     * Check that the deprecated name "htmlStrip" issues a deprecation warning for indices created since 6.0.0
+     * Check that the deprecated name "htmlStrip" issues a deprecation warning for indices created since 6.3.0
      */
     public void testDeprecationWarning() throws IOException {
         Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
-                .put(IndexMetaData.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, Version.CURRENT))
+                .put(IndexMetaData.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_6_3_0, Version.CURRENT))
                 .build();
 
         IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings);
         try (CommonAnalysisPlugin commonAnalysisPlugin = new CommonAnalysisPlugin()) {
             Map<String, CharFilterFactory> charFilters = createTestAnalysis(idxSettings, settings, commonAnalysisPlugin).charFilter;
             CharFilterFactory charFilterFactory = charFilters.get("htmlStrip");
             assertNotNull(charFilterFactory.create(new StringReader("input")));
-            assertWarnings(
-                    "The [htmpStrip] char filter name is deprecated and will be removed in a future version. "
+            assertWarnings("The [htmpStrip] char filter name is deprecated and will be removed in a future version. "
                     + "Please change the filter name to [html_strip] instead.");
         }
     }
 
     /**
-     * Check that the deprecated name "htmlStrip" does NOT issues a deprecation warning for indices created before 6.0.0
+     * Check that the deprecated name "htmlStrip" does NOT issues a deprecation warning for indices created before 6.3.0
      */
-    public void testNoDeprecationWarningPre6() throws IOException {
+    public void testNoDeprecationWarningPre6_3() throws IOException {
         Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
-                .put(IndexMetaData.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_5_0_0, Version.V_5_6_4))
+                .put(IndexMetaData.SETTING_VERSION_CREATED,
+                        VersionUtils.randomVersionBetween(random(), Version.V_5_0_0, Version.V_6_2_4))
                 .build();
 
         IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings);

modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml

@@ -20,8 +20,8 @@
 ---
 "htmlStrip_deprecated":
     - skip:
-        version: " - 6.0.99"
-        reason: deprecated in 6.1
+        version: " - 6.2.99"
+        reason: deprecated in 6.3
         features: "warnings"
 
     - do:
@@ -57,7 +57,7 @@
         index:
           index:   test_deprecated_htmlstrip
           type:    type
-          id:      1
+          id:      2
           body:    { "name": "foo baz" }
 
     - do:
@@ -70,4 +70,3 @@
             text: "<html>foo</html>"
     - length: { tokens: 1 }
     - match:  { tokens.0.token: "\nfoo\n" }
-

server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java

@@ -43,7 +43,7 @@ public static PreConfiguredCharFilter singleton(String name, boolean useFilterFo
     /**
      * Create a pre-configured char filter that may not vary at all, provide access to the elasticsearch verison
      */
-    public static PreConfiguredCharFilter singleton(String name, boolean useFilterForMultitermQueries,
+    public static PreConfiguredCharFilter singletonWithVersion(String name, boolean useFilterForMultitermQueries,
             BiFunction<Reader, org.elasticsearch.Version, Reader> create) {
         return new PreConfiguredCharFilter(name, CachingStrategy.ONE, useFilterForMultitermQueries,
                 (reader, version) -> create.apply(reader, version));
@@ -66,8 +66,6 @@ public static PreConfiguredCharFilter elasticsearchVersion(String name, boolean
         return new PreConfiguredCharFilter(name, CachingStrategy.ELASTICSEARCH, useFilterForMultitermQueries, create);
     }
 
-
-
     private final boolean useFilterForMultitermQueries;
     private final BiFunction<Reader, Version, Reader> create;