Skip to content

[Backport 8.9] Use Stringified<boolean> for preserve_original and indexing_complete #7858

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
Jul 24, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ namespace Elastic.Clients.Elasticsearch.Analysis;
public sealed partial class AsciiFoldingTokenFilter : ITokenFilter
{
[JsonInclude, JsonPropertyName("preserve_original")]
[JsonConverter(typeof(StringifiedBoolConverter))]
public bool? PreserveOriginal { get; set; }

[JsonInclude, JsonPropertyName("type")]
Expand Down Expand Up @@ -65,10 +66,10 @@ public AsciiFoldingTokenFilterDescriptor Version(string? version)
protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
{
writer.WriteStartObject();
if (PreserveOriginalValue.HasValue)
if (PreserveOriginalValue is not null)
{
writer.WritePropertyName("preserve_original");
writer.WriteBooleanValue(PreserveOriginalValue.Value);
JsonSerializer.Serialize(writer, PreserveOriginalValue, options);
}

writer.WritePropertyName("type");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public sealed partial class EdgeNGramTokenFilter : ITokenFilter
[JsonInclude, JsonPropertyName("min_gram")]
public int? MinGram { get; set; }
[JsonInclude, JsonPropertyName("preserve_original")]
[JsonConverter(typeof(StringifiedBoolConverter))]
public bool? PreserveOriginal { get; set; }
[JsonInclude, JsonPropertyName("side")]
public Elastic.Clients.Elasticsearch.Analysis.EdgeNGramSide? Side { get; set; }
Expand Down Expand Up @@ -104,10 +105,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
writer.WriteNumberValue(MinGramValue.Value);
}

if (PreserveOriginalValue.HasValue)
if (PreserveOriginalValue is not null)
{
writer.WritePropertyName("preserve_original");
writer.WriteBooleanValue(PreserveOriginalValue.Value);
JsonSerializer.Serialize(writer, PreserveOriginalValue, options);
}

if (SideValue is not null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public sealed partial class MultiplexerTokenFilter : ITokenFilter
[JsonInclude, JsonPropertyName("filters")]
public ICollection<string> Filters { get; set; }
[JsonInclude, JsonPropertyName("preserve_original")]
[JsonConverter(typeof(StringifiedBoolConverter))]
public bool? PreserveOriginal { get; set; }

[JsonInclude, JsonPropertyName("type")]
Expand Down Expand Up @@ -76,10 +77,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
writer.WriteStartObject();
writer.WritePropertyName("filters");
JsonSerializer.Serialize(writer, FiltersValue, options);
if (PreserveOriginalValue.HasValue)
if (PreserveOriginalValue is not null)
{
writer.WritePropertyName("preserve_original");
writer.WriteBooleanValue(PreserveOriginalValue.Value);
JsonSerializer.Serialize(writer, PreserveOriginalValue, options);
}

writer.WritePropertyName("type");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public sealed partial class NGramTokenFilter : ITokenFilter
[JsonInclude, JsonPropertyName("min_gram")]
public int? MinGram { get; set; }
[JsonInclude, JsonPropertyName("preserve_original")]
[JsonConverter(typeof(StringifiedBoolConverter))]
public bool? PreserveOriginal { get; set; }

[JsonInclude, JsonPropertyName("type")]
Expand Down Expand Up @@ -95,10 +96,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
writer.WriteNumberValue(MinGramValue.Value);
}

if (PreserveOriginalValue.HasValue)
if (PreserveOriginalValue is not null)
{
writer.WritePropertyName("preserve_original");
writer.WriteBooleanValue(PreserveOriginalValue.Value);
JsonSerializer.Serialize(writer, PreserveOriginalValue, options);
}

writer.WritePropertyName("type");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public sealed partial class PatternCaptureTokenFilter : ITokenFilter
[JsonInclude, JsonPropertyName("patterns")]
public ICollection<string> Patterns { get; set; }
[JsonInclude, JsonPropertyName("preserve_original")]
[JsonConverter(typeof(StringifiedBoolConverter))]
public bool? PreserveOriginal { get; set; }

[JsonInclude, JsonPropertyName("type")]
Expand Down Expand Up @@ -76,10 +77,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
writer.WriteStartObject();
writer.WritePropertyName("patterns");
JsonSerializer.Serialize(writer, PatternsValue, options);
if (PreserveOriginalValue.HasValue)
if (PreserveOriginalValue is not null)
{
writer.WritePropertyName("preserve_original");
writer.WriteBooleanValue(PreserveOriginalValue.Value);
JsonSerializer.Serialize(writer, PreserveOriginalValue, options);
}

writer.WritePropertyName("type");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public sealed partial class WordDelimiterGraphTokenFilter : ITokenFilter
[JsonInclude, JsonPropertyName("ignore_keywords")]
public bool? IgnoreKeywords { get; set; }
[JsonInclude, JsonPropertyName("preserve_original")]
[JsonConverter(typeof(StringifiedBoolConverter))]
public bool? PreserveOriginal { get; set; }
[JsonInclude, JsonPropertyName("protected_words")]
public ICollection<string>? ProtectedWords { get; set; }
Expand Down Expand Up @@ -233,10 +234,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
writer.WriteBooleanValue(IgnoreKeywordsValue.Value);
}

if (PreserveOriginalValue.HasValue)
if (PreserveOriginalValue is not null)
{
writer.WritePropertyName("preserve_original");
writer.WriteBooleanValue(PreserveOriginalValue.Value);
JsonSerializer.Serialize(writer, PreserveOriginalValue, options);
}

if (ProtectedWordsValue is not null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public sealed partial class WordDelimiterTokenFilter : ITokenFilter
[JsonInclude, JsonPropertyName("generate_word_parts")]
public bool? GenerateWordParts { get; set; }
[JsonInclude, JsonPropertyName("preserve_original")]
[JsonConverter(typeof(StringifiedBoolConverter))]
public bool? PreserveOriginal { get; set; }
[JsonInclude, JsonPropertyName("protected_words")]
public ICollection<string>? ProtectedWords { get; set; }
Expand Down Expand Up @@ -203,10 +204,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
writer.WriteBooleanValue(GenerateWordPartsValue.Value);
}

if (PreserveOriginalValue.HasValue)
if (PreserveOriginalValue is not null)
{
writer.WritePropertyName("preserve_original");
writer.WriteBooleanValue(PreserveOriginalValue.Value);
JsonSerializer.Serialize(writer, PreserveOriginalValue, options);
}

if (ProtectedWordsValue is not null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#nullable restore

using System;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Runtime.Serialization;
using Elastic.Transport;
using Elastic.Clients.Elasticsearch.Core;
using Elastic.Clients.Elasticsearch.Serialization;
using Elastic.Transport;

namespace Elastic.Clients.Elasticsearch.Aggregations;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#nullable restore

using System;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Runtime.Serialization;
using Elastic.Transport;
using Elastic.Clients.Elasticsearch.Core;
using Elastic.Clients.Elasticsearch.Serialization;
using Elastic.Transport;

namespace Elastic.Clients.Elasticsearch.Analysis;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#nullable restore

using System;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Runtime.Serialization;
using Elastic.Transport;
using Elastic.Clients.Elasticsearch.Core;
using Elastic.Clients.Elasticsearch.Serialization;
using Elastic.Transport;

namespace Elastic.Clients.Elasticsearch.Cluster;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#nullable restore

using System;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Runtime.Serialization;
using Elastic.Transport;
using Elastic.Clients.Elasticsearch.Core;
using Elastic.Clients.Elasticsearch.Serialization;
using Elastic.Transport;

namespace Elastic.Clients.Elasticsearch.Core.Search;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#nullable restore

using System;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Runtime.Serialization;
using Elastic.Transport;
using Elastic.Clients.Elasticsearch.Core;
using Elastic.Clients.Elasticsearch.Serialization;
using Elastic.Transport;

namespace Elastic.Clients.Elasticsearch.Enrich;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#nullable restore

using System;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Runtime.Serialization;
using Elastic.Transport;
using Elastic.Clients.Elasticsearch.Core;
using Elastic.Clients.Elasticsearch.Serialization;
using Elastic.Transport;

namespace Elastic.Clients.Elasticsearch.Eql;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#nullable restore

using System;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Runtime.Serialization;
using Elastic.Transport;
using Elastic.Clients.Elasticsearch.Core;
using Elastic.Clients.Elasticsearch.Serialization;
using Elastic.Transport;

namespace Elastic.Clients.Elasticsearch.IndexManagement;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#nullable restore

using System;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Runtime.Serialization;
using Elastic.Transport;
using Elastic.Clients.Elasticsearch.Core;
using Elastic.Clients.Elasticsearch.Serialization;
using Elastic.Transport;

namespace Elastic.Clients.Elasticsearch.Ingest;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#nullable restore

using System;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Runtime.Serialization;
using Elastic.Transport;
using Elastic.Clients.Elasticsearch.Core;
using Elastic.Clients.Elasticsearch.Serialization;
using Elastic.Transport;

namespace Elastic.Clients.Elasticsearch.Mapping;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#nullable restore

using System;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Runtime.Serialization;
using Elastic.Transport;
using Elastic.Clients.Elasticsearch.Core;
using Elastic.Clients.Elasticsearch.Serialization;
using Elastic.Transport;

namespace Elastic.Clients.Elasticsearch.Ml;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#nullable restore

using System;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Runtime.Serialization;
using Elastic.Transport;
using Elastic.Clients.Elasticsearch.Core;
using Elastic.Clients.Elasticsearch.Serialization;
using Elastic.Transport;

namespace Elastic.Clients.Elasticsearch;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#nullable restore

using System;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Runtime.Serialization;
using Elastic.Transport;
using Elastic.Clients.Elasticsearch.Core;
using Elastic.Clients.Elasticsearch.Serialization;
using Elastic.Transport;

namespace Elastic.Clients.Elasticsearch.QueryDsl;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#nullable restore

using System;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Runtime.Serialization;
using Elastic.Transport;
using Elastic.Clients.Elasticsearch.Core;
using Elastic.Clients.Elasticsearch.Serialization;
using Elastic.Transport;

namespace Elastic.Clients.Elasticsearch.Tasks;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#nullable restore

using System;
using System.Runtime.Serialization;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Runtime.Serialization;
using Elastic.Transport;
using Elastic.Clients.Elasticsearch.Core;
using Elastic.Clients.Elasticsearch.Serialization;
using Elastic.Transport;

namespace Elastic.Clients.Elasticsearch.Watcher;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public sealed partial class IndexSettingsLifecycle
/// <para>Indicates whether or not the index has been rolled over. Automatically set to true when ILM completes the rollover action.<br/>You can explicitly set it to skip rollover.</para>
/// </summary>
[JsonInclude, JsonPropertyName("indexing_complete")]
[JsonConverter(typeof(StringifiedBoolConverter))]
public bool? IndexingComplete { get; set; }

/// <summary>
Expand Down Expand Up @@ -151,10 +152,10 @@ public IndexSettingsLifecycleDescriptor Step(Action<IndexSettingsLifecycleStepDe
protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
{
writer.WriteStartObject();
if (IndexingCompleteValue.HasValue)
if (IndexingCompleteValue is not null)
{
writer.WritePropertyName("indexing_complete");
writer.WriteBooleanValue(IndexingCompleteValue.Value);
JsonSerializer.Serialize(writer, IndexingCompleteValue, options);
}

writer.WritePropertyName("name");
Expand Down