Skip to content

Commit 1b791fe

Browse files
authored
deprecate standard token filter as per elastic/elasticsearch#33468 (#3520)
1 parent 02fa830 commit 1b791fe

File tree

5 files changed

+14
-1
lines changed

5 files changed

+14
-1
lines changed

src/Nest/Analysis/TokenFilters/StandardTokenFilter.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
1-
namespace Nest
1+
using System;
2+
3+
namespace Nest
24
{
35
/// <summary>
46
/// A token filter of type standard that normalizes tokens extracted with the Standard Tokenizer.
57
/// </summary>
8+
[Obsolete(" The `standard` token filter has been deprecated because it doesn't change anything in the stream. It will be removed in 7.0.")]
69
public interface IStandardTokenFilter : ITokenFilter { }
710

811
/// <inheritdoc />
12+
[Obsolete(" The `standard` token filter has been deprecated because it doesn't change anything in the stream. It will be removed in 7.0.")]
913
public class StandardTokenFilter : TokenFilterBase, IStandardTokenFilter
1014
{
1115
public StandardTokenFilter() : base("standard") { }
1216
}
1317

1418
/// <inheritdoc />
19+
[Obsolete(" The `standard` token filter has been deprecated because it doesn't change anything in the stream. It will be removed in 7.0.")]
1520
public class StandardTokenFilterDescriptor
1621
: TokenFilterDescriptorBase<StandardTokenFilterDescriptor, IStandardTokenFilter>, IStandardTokenFilter
1722
{

src/Nest/Analysis/TokenFilters/TokenFilterJsonConverter.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
4747
case "stemmer": return o.ToObject<StemmerTokenFilter>(ElasticContractResolver.Empty);
4848
case "stemmer_override": return o.ToObject<StemmerOverrideTokenFilter>(ElasticContractResolver.Empty);
4949
case "stop": return o.ToObject<StopTokenFilter>(ElasticContractResolver.Empty);
50+
#pragma warning disable 618
5051
case "standard": return o.ToObject<StandardTokenFilter>(ElasticContractResolver.Empty);
52+
#pragma warning restore 618
5153
case "synonym": return o.ToObject<SynonymTokenFilter>(ElasticContractResolver.Empty);
5254
case "synonym_graph": return o.ToObject<SynonymGraphTokenFilter>(ElasticContractResolver.Empty);
5355
case "trim": return o.ToObject<TrimTokenFilter>(ElasticContractResolver.Empty);

src/Nest/Analysis/TokenFilters/TokenFilters.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,10 @@ public TokenFiltersDescriptor Snowball(string name, Func<SnowballTokenFilterDesc
214214
/// <summary>
215215
/// A token filter of type standard that normalizes tokens extracted with the Standard Tokenizer.
216216
/// </summary>
217+
#pragma warning disable 618
217218
public TokenFiltersDescriptor Standard(string name, Func<StandardTokenFilterDescriptor, IStandardTokenFilter> selector = null) =>
218219
Assign(name, selector.InvokeOrDefault(new StandardTokenFilterDescriptor()));
220+
#pragma warning restore 618
219221

220222
/// <summary>
221223
/// A filter that stems words (similar to snowball, but with more options).

src/Nest/Indices/Analyze/AnalyzeTokenFilters.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,10 @@ public AnalyzeTokenFiltersDescriptor Snowball(Func<SnowballTokenFilterDescriptor
236236
/// <summary>
237237
/// A token filter of type standard that normalizes tokens extracted with the Standard Tokenizer.
238238
/// </summary>
239+
#pragma warning disable 618
239240
public AnalyzeTokenFiltersDescriptor Standard(Func<StandardTokenFilterDescriptor, IStandardTokenFilter> selector = null) =>
240241
AssignIfNotNull(selector.InvokeOrDefault(new StandardTokenFilterDescriptor()));
242+
#pragma warning restore 618
241243

242244
/// <summary>
243245
/// A filter that stems words (similar to snowball, but with more options).

src/Tests/Tests/Analysis/TokenFilters/TokenFilterTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,9 @@ public class StandardTests : TokenFilterAssertionBase<StandardTests>
561561
{
562562
public override FuncTokenFilters Fluent => (n, tf) => tf.Standard(n);
563563

564+
#pragma warning disable 618
564565
public override ITokenFilter Initializer => new StandardTokenFilter();
566+
#pragma warning restore 618
565567

566568
public override object Json => new { type = "standard" };
567569
public override string Name => "standard";

0 commit comments

Comments
 (0)