Skip to content

Improvements to container generation mostly affecting sorting #6930

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.

Sign up for GitHub

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 5 commits into from
Nov 8, 2022
Merged

Improvements to container generation mostly affecting sorting #6930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a5cd9bd
FieldSort is marked for use on requests
stevejgordon Nov 7, 2022
97cbb6a
Sort descriptor methods
stevejgordon Nov 7, 2022
469322c
Generate more descriptive parameter names for container descriptor me…
stevejgordon Nov 7, 2022
543e75d
Support fluent container additional properties
stevejgordon Nov 8, 2022
ebe0b2b
Remove BOM
stevejgordon Nov 8, 2022
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
11 changes: 11 additions & 0 deletions src/Elastic.Clients.Elasticsearch/Types/SortConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Licensed to Elasticsearch B.V under one or more agreements.
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
// See the LICENSE file in the project root for more information.

using Elastic.Clients.Elasticsearch.Serialization;

namespace Elastic.Clients.Elasticsearch;

internal sealed class SortConverter : ICollectionSingleOrManyConverter<SortOptions>
{
}
174 changes: 146 additions & 28 deletions src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitRequest.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,14 @@ public AsyncSearchSubmitRequestDescriptor<TDocument> Indices(Elastic.Clients.Ela

private Action<SlicedScrollDescriptor<TDocument>> SliceDescriptorAction { get; set; }

private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }

private SortOptionsDescriptor<TDocument> SortDescriptor { get; set; }

private Action<SortOptionsDescriptor<TDocument>> SortDescriptorAction { get; set; }

private Action<SortOptionsDescriptor<TDocument>>[] SortDescriptorActions { get; set; }

private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; }

private bool? ExplainValue { get; set; }
Expand Down Expand Up @@ -925,8 +933,6 @@ public AsyncSearchSubmitRequestDescriptor<TDocument> Indices(Elastic.Clients.Ela

private int? SizeValue { get; set; }

private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }

private ICollection<string>? StatsValue { get; set; }

private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; }
Expand Down Expand Up @@ -1223,6 +1229,42 @@ public AsyncSearchSubmitRequestDescriptor<TDocument> Slice(Action<SlicedScrollDe
return Self;
}

public AsyncSearchSubmitRequestDescriptor<TDocument> Sort(ICollection<Elastic.Clients.Elasticsearch.SortOptions>? sort)
{
SortDescriptor = null;
SortDescriptorAction = null;
SortDescriptorActions = null;
SortValue = sort;
return Self;
}

public AsyncSearchSubmitRequestDescriptor<TDocument> Sort(SortOptionsDescriptor<TDocument> descriptor)
{
SortValue = null;
SortDescriptorAction = null;
SortDescriptorActions = null;
SortDescriptor = descriptor;
return Self;
}

public AsyncSearchSubmitRequestDescriptor<TDocument> Sort(Action<SortOptionsDescriptor<TDocument>> configure)
{
SortValue = null;
SortDescriptor = null;
SortDescriptorActions = null;
SortDescriptorAction = configure;
return Self;
}

public AsyncSearchSubmitRequestDescriptor<TDocument> Sort(params Action<SortOptionsDescriptor<TDocument>>[] configure)
{
SortValue = null;
SortDescriptor = null;
SortDescriptorAction = null;
SortDescriptorActions = configure;
return Self;
}

public AsyncSearchSubmitRequestDescriptor<TDocument> Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source)
{
SourceValue = source;
Expand Down Expand Up @@ -1319,12 +1361,6 @@ public AsyncSearchSubmitRequestDescriptor<TDocument> Size(int? size)
return Self;
}

public AsyncSearchSubmitRequestDescriptor<TDocument> Sort(ICollection<Elastic.Clients.Elasticsearch.SortOptions>? sort)
{
SortValue = sort;
return Self;
}

public AsyncSearchSubmitRequestDescriptor<TDocument> Stats(ICollection<string>? stats)
{
StatsValue = stats;
Expand Down Expand Up @@ -1599,6 +1635,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
JsonSerializer.Serialize(writer, SliceValue, options);
}

if (SortDescriptor is not null)
{
writer.WritePropertyName("sort");
JsonSerializer.Serialize(writer, SortDescriptor, options);
}
else if (SortDescriptorAction is not null)
{
writer.WritePropertyName("sort");
JsonSerializer.Serialize(writer, new SortOptionsDescriptor<TDocument>(SortDescriptorAction), options);
}
else if (SortDescriptorActions is not null)
{
writer.WritePropertyName("sort");
if (SortDescriptorActions.Length > 1)
writer.WriteStartArray();
foreach (var action in SortDescriptorActions)
{
JsonSerializer.Serialize(writer, new SortOptionsDescriptor<TDocument>(action), options);
}

if (SortDescriptorActions.Length > 1)
writer.WriteEndArray();
}
else if (SortValue is not null)
{
writer.WritePropertyName("sort");
SingleOrManySerializationHelper.Serialize<Elastic.Clients.Elasticsearch.SortOptions>(SortValue, writer, options);
}

if (SourceValue is not null)
{
writer.WritePropertyName("_source");
Expand Down Expand Up @@ -1687,12 +1752,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
writer.WriteNumberValue(SizeValue.Value);
}

if (SortValue is not null)
{
writer.WritePropertyName("sort");
SingleOrManySerializationHelper.Serialize<Elastic.Clients.Elasticsearch.SortOptions>(SortValue, writer, options);
}

if (StatsValue is not null)
{
writer.WritePropertyName("stats");
Expand Down Expand Up @@ -1869,6 +1928,14 @@ public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Elasticsearch.

private Action<SlicedScrollDescriptor> SliceDescriptorAction { get; set; }

private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }

private SortOptionsDescriptor SortDescriptor { get; set; }

private Action<SortOptionsDescriptor> SortDescriptorAction { get; set; }

private Action<SortOptionsDescriptor>[] SortDescriptorActions { get; set; }

private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; }

private bool? ExplainValue { get; set; }
Expand Down Expand Up @@ -1899,8 +1966,6 @@ public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Elasticsearch.

private int? SizeValue { get; set; }

private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }

private ICollection<string>? StatsValue { get; set; }

private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; }
Expand Down Expand Up @@ -2197,6 +2262,42 @@ public AsyncSearchSubmitRequestDescriptor Slice(Action<SlicedScrollDescriptor> c
return Self;
}

public AsyncSearchSubmitRequestDescriptor Sort(ICollection<Elastic.Clients.Elasticsearch.SortOptions>? sort)
{
SortDescriptor = null;
SortDescriptorAction = null;
SortDescriptorActions = null;
SortValue = sort;
return Self;
}

public AsyncSearchSubmitRequestDescriptor Sort(SortOptionsDescriptor descriptor)
{
SortValue = null;
SortDescriptorAction = null;
SortDescriptorActions = null;
SortDescriptor = descriptor;
return Self;
}

public AsyncSearchSubmitRequestDescriptor Sort(Action<SortOptionsDescriptor> configure)
{
SortValue = null;
SortDescriptor = null;
SortDescriptorActions = null;
SortDescriptorAction = configure;
return Self;
}

public AsyncSearchSubmitRequestDescriptor Sort(params Action<SortOptionsDescriptor>[] configure)
{
SortValue = null;
SortDescriptor = null;
SortDescriptorAction = null;
SortDescriptorActions = configure;
return Self;
}

public AsyncSearchSubmitRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source)
{
SourceValue = source;
Expand Down Expand Up @@ -2293,12 +2394,6 @@ public AsyncSearchSubmitRequestDescriptor Size(int? size)
return Self;
}

public AsyncSearchSubmitRequestDescriptor Sort(ICollection<Elastic.Clients.Elasticsearch.SortOptions>? sort)
{
SortValue = sort;
return Self;
}

public AsyncSearchSubmitRequestDescriptor Stats(ICollection<string>? stats)
{
StatsValue = stats;
Expand Down Expand Up @@ -2573,6 +2668,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
JsonSerializer.Serialize(writer, SliceValue, options);
}

if (SortDescriptor is not null)
{
writer.WritePropertyName("sort");
JsonSerializer.Serialize(writer, SortDescriptor, options);
}
else if (SortDescriptorAction is not null)
{
writer.WritePropertyName("sort");
JsonSerializer.Serialize(writer, new SortOptionsDescriptor(SortDescriptorAction), options);
}
else if (SortDescriptorActions is not null)
{
writer.WritePropertyName("sort");
if (SortDescriptorActions.Length > 1)
writer.WriteStartArray();
foreach (var action in SortDescriptorActions)
{
JsonSerializer.Serialize(writer, new SortOptionsDescriptor(action), options);
}

if (SortDescriptorActions.Length > 1)
writer.WriteEndArray();
}
else if (SortValue is not null)
{
writer.WritePropertyName("sort");
SingleOrManySerializationHelper.Serialize<Elastic.Clients.Elasticsearch.SortOptions>(SortValue, writer, options);
}

if (SourceValue is not null)
{
writer.WritePropertyName("_source");
Expand Down Expand Up @@ -2661,12 +2785,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
writer.WriteNumberValue(SizeValue.Value);
}

if (SortValue is not null)
{
writer.WritePropertyName("sort");
SingleOrManySerializationHelper.Serialize<Elastic.Clients.Elasticsearch.SortOptions>(SortValue, writer, options);
}

if (StatsValue is not null)
{
writer.WritePropertyName("stats");
Expand Down
Loading