Skip to content

Add articles_case to elision token filter #3572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions src/Nest/Analysis/TokenFilters/ElisionTokenFilter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,42 @@ public interface IElisionTokenFilter : ITokenFilter
/// </summary>
[JsonProperty("articles")]
IEnumerable<string> Articles { get; set; }

/// <summary>
/// Whether articles should be handled case-insensitively. Defaults to <c>false</c>.
/// </summary>
[JsonProperty("articles_case")]
bool? ArticlesCase { get; set; }
}

/// <inheritdoc />
/// <inheritdoc cref="IElisionTokenFilter"/>
public class ElisionTokenFilter : TokenFilterBase, IElisionTokenFilter
{
public ElisionTokenFilter() : base("elision") { }

/// <inheritdoc />
public IEnumerable<string> Articles { get; set; }

/// <inheritdoc />
public bool? ArticlesCase { get; set; }
}

/// <inheritdoc />
/// <inheritdoc cref="IElisionTokenFilter"/>
public class ElisionTokenFilterDescriptor
: TokenFilterDescriptorBase<ElisionTokenFilterDescriptor, IElisionTokenFilter>, IElisionTokenFilter
{
protected override string Type => "elision";

IEnumerable<string> IElisionTokenFilter.Articles { get; set; }
bool? IElisionTokenFilter.ArticlesCase { get; set; }

/// <inheritdoc />
/// <inheritdoc cref="IElisionTokenFilter.Articles"/>
public ElisionTokenFilterDescriptor Articles(IEnumerable<string> articles) => Assign(a => a.Articles = articles);

/// <inheritdoc />
/// <inheritdoc cref="IElisionTokenFilter.Articles"/>
public ElisionTokenFilterDescriptor Articles(params string[] articles) => Assign(a => a.Articles = articles);

/// <inheritdoc cref="IElisionTokenFilter.ArticlesCase"/>
public ElisionTokenFilterDescriptor ArticlesCase(bool? articlesCase = true) => Assign(a => a.ArticlesCase = articlesCase);
}
}
6 changes: 3 additions & 3 deletions src/Tests/Tests/Analysis/TokenFilters/TokenFilterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ public class EdgeNgramTests : TokenFilterAssertionBase<EdgeNgramTests>

public class ElisionTests : TokenFilterAssertionBase<ElisionTests>
{
public override FuncTokenFilters Fluent => (n, tf) => tf.Elision(n, t => t.Articles("a", "b", "c"));
public override FuncTokenFilters Fluent => (n, tf) => tf.Elision(n, t => t.Articles("a", "b", "c").ArticlesCase());

public override ITokenFilter Initializer => new ElisionTokenFilter { Articles = new[] { "a", "b", "c" } };
public override ITokenFilter Initializer => new ElisionTokenFilter { Articles = new[] { "a", "b", "c" }, ArticlesCase = true };

public override object Json => new { type = "elision", articles = new[] { "a", "b", "c" } };
public override object Json => new { type = "elision", articles = new[] { "a", "b", "c" }, articles_case = true };
public override string Name => "el";
}

Expand Down