Skip to content

[Backport 8.5] Generate the 8.4 version of the spec #6690

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 1 commit into from
Sep 29, 2022
Merged

[Backport 8.5] Generate the 8.4 version of the spec #6690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/Elastic.Clients.Elasticsearch/_Generated/Api/ApiUrlsLookup.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ internal static class ApiUrlsLookups
internal static ApiUrls SecuritySamlLogout = new ApiUrls(new[] { "/_security/saml/logout" });
internal static ApiUrls SecuritySamlPrepareAuthentication = new ApiUrls(new[] { "/_security/saml/prepare" });
internal static ApiUrls SecuritySamlServiceProviderMetadata = new ApiUrls(new[] { "/_security/saml/metadata/{realm_name}" });
internal static ApiUrls SecurityUpdateApiKey = new ApiUrls(new[] { "/_security/api_key/{id}" });
internal static ApiUrls SnapshotLifecycleManagementDeleteLifecycle = new ApiUrls(new[] { "/_slm/policy/{policy_id}" });
internal static ApiUrls SnapshotLifecycleManagementExecuteLifecycle = new ApiUrls(new[] { "/_slm/policy/{policy_id}/_execute" });
internal static ApiUrls SnapshotLifecycleManagementExecuteRetention = new ApiUrls(new[] { "/_slm/_execute_retention" });
Expand Down
108 changes: 108 additions & 0 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 @@ -190,6 +190,12 @@ public override AsyncSearchSubmitRequest Read(ref Utf8JsonReader reader, Type ty
continue;
}

if (property == "knn")
{
variant.Knn = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.KnnQuery?>(ref reader, options);
continue;
}

if (property == "min_score")
{
variant.MinScore = JsonSerializer.Deserialize<double?>(ref reader, options);
Expand Down Expand Up @@ -384,6 +390,12 @@ public override void Write(Utf8JsonWriter writer, AsyncSearchSubmitRequest value
JsonSerializer.Serialize(writer, value.DocvalueFields, options);
}

if (value.Knn is not null)
{
writer.WritePropertyName("knn");
JsonSerializer.Serialize(writer, value.Knn, options);
}

if (value.MinScore.HasValue)
{
writer.WritePropertyName("min_score");
Expand Down Expand Up @@ -666,6 +678,10 @@ public AsyncSearchSubmitRequest(Elastic.Clients.Elasticsearch.Indices? indices)
[JsonPropertyName("docvalue_fields")]
public IEnumerable<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFields { get; set; }

[JsonInclude]
[JsonPropertyName("knn")]
public Elastic.Clients.Elasticsearch.KnnQuery? Knn { get; set; }

[JsonInclude]
[JsonPropertyName("min_score")]
public double? MinScore { get; set; }
Expand Down Expand Up @@ -845,6 +861,12 @@ public AsyncSearchSubmitRequestDescriptor<TDocument> Indices(Elastic.Clients.Ela

private Action<HighlightDescriptor<TDocument>> HighlightDescriptorAction { get; set; }

private Elastic.Clients.Elasticsearch.KnnQuery? KnnValue { get; set; }

private KnnQueryDescriptor<TDocument> KnnDescriptor { get; set; }

private Action<KnnQueryDescriptor<TDocument>> KnnDescriptorAction { get; set; }

private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilterValue { get; set; }

private QueryDsl.QueryContainerDescriptor<TDocument> PostFilterDescriptor { get; set; }
Expand Down Expand Up @@ -1067,6 +1089,30 @@ public AsyncSearchSubmitRequestDescriptor<TDocument> Highlight(Action<HighlightD
return Self;
}

public AsyncSearchSubmitRequestDescriptor<TDocument> Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn)
{
KnnDescriptor = null;
KnnDescriptorAction = null;
KnnValue = knn;
return Self;
}

public AsyncSearchSubmitRequestDescriptor<TDocument> Knn(KnnQueryDescriptor<TDocument> descriptor)
{
KnnValue = null;
KnnDescriptorAction = null;
KnnDescriptor = descriptor;
return Self;
}

public AsyncSearchSubmitRequestDescriptor<TDocument> Knn(Action<KnnQueryDescriptor<TDocument>> configure)
{
KnnValue = null;
KnnDescriptor = null;
KnnDescriptorAction = configure;
return Self;
}

public AsyncSearchSubmitRequestDescriptor<TDocument> PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? postFilter)
{
PostFilterDescriptor = null;
Expand Down Expand Up @@ -1462,6 +1508,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
JsonSerializer.Serialize(writer, HighlightValue, options);
}

if (KnnDescriptor is not null)
{
writer.WritePropertyName("knn");
JsonSerializer.Serialize(writer, KnnDescriptor, options);
}
else if (KnnDescriptorAction is not null)
{
writer.WritePropertyName("knn");
JsonSerializer.Serialize(writer, new KnnQueryDescriptor<TDocument>(KnnDescriptorAction), options);
}
else if (KnnValue is not null)
{
writer.WritePropertyName("knn");
JsonSerializer.Serialize(writer, KnnValue, options);
}

if (PostFilterDescriptor is not null)
{
writer.WritePropertyName("post_filter");
Expand Down Expand Up @@ -1779,6 +1841,12 @@ public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Elasticsearch.

private Action<HighlightDescriptor> HighlightDescriptorAction { get; set; }

private Elastic.Clients.Elasticsearch.KnnQuery? KnnValue { get; set; }

private KnnQueryDescriptor KnnDescriptor { get; set; }

private Action<KnnQueryDescriptor> KnnDescriptorAction { get; set; }

private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilterValue { get; set; }

private QueryDsl.QueryContainerDescriptor PostFilterDescriptor { get; set; }
Expand Down Expand Up @@ -2001,6 +2069,30 @@ public AsyncSearchSubmitRequestDescriptor Highlight(Action<HighlightDescriptor>
return Self;
}

public AsyncSearchSubmitRequestDescriptor Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn)
{
KnnDescriptor = null;
KnnDescriptorAction = null;
KnnValue = knn;
return Self;
}

public AsyncSearchSubmitRequestDescriptor Knn(KnnQueryDescriptor descriptor)
{
KnnValue = null;
KnnDescriptorAction = null;
KnnDescriptor = descriptor;
return Self;
}

public AsyncSearchSubmitRequestDescriptor Knn(Action<KnnQueryDescriptor> configure)
{
KnnValue = null;
KnnDescriptor = null;
KnnDescriptorAction = configure;
return Self;
}

public AsyncSearchSubmitRequestDescriptor PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? postFilter)
{
PostFilterDescriptor = null;
Expand Down Expand Up @@ -2402,6 +2494,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
JsonSerializer.Serialize(writer, HighlightValue, options);
}

if (KnnDescriptor is not null)
{
writer.WritePropertyName("knn");
JsonSerializer.Serialize(writer, KnnDescriptor, options);
}
else if (KnnDescriptorAction is not null)
{
writer.WritePropertyName("knn");
JsonSerializer.Serialize(writer, new KnnQueryDescriptor(KnnDescriptorAction), options);
}
else if (KnnValue is not null)
{
writer.WritePropertyName("knn");
JsonSerializer.Serialize(writer, KnnValue, options);
}

if (PostFilterDescriptor is not null)
{
writer.WritePropertyName("post_filter");
Expand Down
108 changes: 108 additions & 0 deletions src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,12 @@ public override SearchRequest Read(ref Utf8JsonReader reader, Type typeToConvert
continue;
}

if (property == "knn")
{
variant.Knn = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.KnnQuery?>(ref reader, options);
continue;
}

if (property == "min_score")
{
variant.MinScore = JsonSerializer.Deserialize<double?>(ref reader, options);
Expand Down Expand Up @@ -375,6 +381,12 @@ public override void Write(Utf8JsonWriter writer, SearchRequest value, JsonSeria
JsonSerializer.Serialize(writer, value.DocvalueFields, options);
}

if (value.Knn is not null)
{
writer.WritePropertyName("knn");
JsonSerializer.Serialize(writer, value.Knn, options);
}

if (value.MinScore.HasValue)
{
writer.WritePropertyName("min_score");
Expand Down Expand Up @@ -648,6 +660,10 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
[JsonPropertyName("docvalue_fields")]
public IEnumerable<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFields { get; set; }

[JsonInclude]
[JsonPropertyName("knn")]
public Elastic.Clients.Elasticsearch.KnnQuery? Knn { get; set; }

[JsonInclude]
[JsonPropertyName("min_score")]
public double? MinScore { get; set; }
Expand Down Expand Up @@ -828,6 +844,12 @@ public SearchRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.

private Action<HighlightDescriptor<TDocument>> HighlightDescriptorAction { get; set; }

private Elastic.Clients.Elasticsearch.KnnQuery? KnnValue { get; set; }

private KnnQueryDescriptor<TDocument> KnnDescriptor { get; set; }

private Action<KnnQueryDescriptor<TDocument>> KnnDescriptorAction { get; set; }

private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilterValue { get; set; }

private QueryDsl.QueryContainerDescriptor<TDocument> PostFilterDescriptor { get; set; }
Expand Down Expand Up @@ -1050,6 +1072,30 @@ public SearchRequestDescriptor<TDocument> Highlight(Action<HighlightDescriptor<T
return Self;
}

public SearchRequestDescriptor<TDocument> Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn)
{
KnnDescriptor = null;
KnnDescriptorAction = null;
KnnValue = knn;
return Self;
}

public SearchRequestDescriptor<TDocument> Knn(KnnQueryDescriptor<TDocument> descriptor)
{
KnnValue = null;
KnnDescriptorAction = null;
KnnDescriptor = descriptor;
return Self;
}

public SearchRequestDescriptor<TDocument> Knn(Action<KnnQueryDescriptor<TDocument>> configure)
{
KnnValue = null;
KnnDescriptor = null;
KnnDescriptorAction = configure;
return Self;
}

public SearchRequestDescriptor<TDocument> PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? postFilter)
{
PostFilterDescriptor = null;
Expand Down Expand Up @@ -1445,6 +1491,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
JsonSerializer.Serialize(writer, HighlightValue, options);
}

if (KnnDescriptor is not null)
{
writer.WritePropertyName("knn");
JsonSerializer.Serialize(writer, KnnDescriptor, options);
}
else if (KnnDescriptorAction is not null)
{
writer.WritePropertyName("knn");
JsonSerializer.Serialize(writer, new KnnQueryDescriptor<TDocument>(KnnDescriptorAction), options);
}
else if (KnnValue is not null)
{
writer.WritePropertyName("knn");
JsonSerializer.Serialize(writer, KnnValue, options);
}

if (PostFilterDescriptor is not null)
{
writer.WritePropertyName("post_filter");
Expand Down Expand Up @@ -1763,6 +1825,12 @@ public SearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? in

private Action<HighlightDescriptor> HighlightDescriptorAction { get; set; }

private Elastic.Clients.Elasticsearch.KnnQuery? KnnValue { get; set; }

private KnnQueryDescriptor KnnDescriptor { get; set; }

private Action<KnnQueryDescriptor> KnnDescriptorAction { get; set; }

private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilterValue { get; set; }

private QueryDsl.QueryContainerDescriptor PostFilterDescriptor { get; set; }
Expand Down Expand Up @@ -1985,6 +2053,30 @@ public SearchRequestDescriptor Highlight(Action<HighlightDescriptor> configure)
return Self;
}

public SearchRequestDescriptor Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn)
{
KnnDescriptor = null;
KnnDescriptorAction = null;
KnnValue = knn;
return Self;
}

public SearchRequestDescriptor Knn(KnnQueryDescriptor descriptor)
{
KnnValue = null;
KnnDescriptorAction = null;
KnnDescriptor = descriptor;
return Self;
}

public SearchRequestDescriptor Knn(Action<KnnQueryDescriptor> configure)
{
KnnValue = null;
KnnDescriptor = null;
KnnDescriptorAction = configure;
return Self;
}

public SearchRequestDescriptor PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? postFilter)
{
PostFilterDescriptor = null;
Expand Down Expand Up @@ -2386,6 +2478,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
JsonSerializer.Serialize(writer, HighlightValue, options);
}

if (KnnDescriptor is not null)
{
writer.WritePropertyName("knn");
JsonSerializer.Serialize(writer, KnnDescriptor, options);
}
else if (KnnDescriptorAction is not null)
{
writer.WritePropertyName("knn");
JsonSerializer.Serialize(writer, new KnnQueryDescriptor(KnnDescriptorAction), options);
}
else if (KnnValue is not null)
{
writer.WritePropertyName("knn");
JsonSerializer.Serialize(writer, KnnValue, options);
}

if (PostFilterDescriptor is not null)
{
writer.WritePropertyName("post_filter");
Expand Down
Loading