Skip to content

Commit 1a955fa

Browse files
github-actions[bot]stevejgordon
github-actions[bot]
and
stevejgordon
authored
Generate client from 8.4 API specification (#6679) (#6690)
Co-authored-by: Steve Gordon <sgordon@hotmail.co.uk>
1 parent 0b80b35 commit 1a955fa

20 files changed

+2318
-0
lines changed

‎src/Elastic.Clients.Elasticsearch/_Generated/Api/ApiUrlsLookup.g.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ internal static class ApiUrlsLookups
263263
internal static ApiUrls SecuritySamlLogout = new ApiUrls(new[] { "/_security/saml/logout" });
264264
internal static ApiUrls SecuritySamlPrepareAuthentication = new ApiUrls(new[] { "/_security/saml/prepare" });
265265
internal static ApiUrls SecuritySamlServiceProviderMetadata = new ApiUrls(new[] { "/_security/saml/metadata/{realm_name}" });
266+
internal static ApiUrls SecurityUpdateApiKey = new ApiUrls(new[] { "/_security/api_key/{id}" });
266267
internal static ApiUrls SnapshotLifecycleManagementDeleteLifecycle = new ApiUrls(new[] { "/_slm/policy/{policy_id}" });
267268
internal static ApiUrls SnapshotLifecycleManagementExecuteLifecycle = new ApiUrls(new[] { "/_slm/policy/{policy_id}/_execute" });
268269
internal static ApiUrls SnapshotLifecycleManagementExecuteRetention = new ApiUrls(new[] { "/_slm/_execute_retention" });

‎src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitRequest.g.cs

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,12 @@ public override AsyncSearchSubmitRequest Read(ref Utf8JsonReader reader, Type ty
190190
continue;
191191
}
192192

193+
if (property == "knn")
194+
{
195+
variant.Knn = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.KnnQuery?>(ref reader, options);
196+
continue;
197+
}
198+
193199
if (property == "min_score")
194200
{
195201
variant.MinScore = JsonSerializer.Deserialize<double?>(ref reader, options);
@@ -384,6 +390,12 @@ public override void Write(Utf8JsonWriter writer, AsyncSearchSubmitRequest value
384390
JsonSerializer.Serialize(writer, value.DocvalueFields, options);
385391
}
386392

393+
if (value.Knn is not null)
394+
{
395+
writer.WritePropertyName("knn");
396+
JsonSerializer.Serialize(writer, value.Knn, options);
397+
}
398+
387399
if (value.MinScore.HasValue)
388400
{
389401
writer.WritePropertyName("min_score");
@@ -666,6 +678,10 @@ public AsyncSearchSubmitRequest(Elastic.Clients.Elasticsearch.Indices? indices)
666678
[JsonPropertyName("docvalue_fields")]
667679
public IEnumerable<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFields { get; set; }
668680

681+
[JsonInclude]
682+
[JsonPropertyName("knn")]
683+
public Elastic.Clients.Elasticsearch.KnnQuery? Knn { get; set; }
684+
669685
[JsonInclude]
670686
[JsonPropertyName("min_score")]
671687
public double? MinScore { get; set; }
@@ -845,6 +861,12 @@ public AsyncSearchSubmitRequestDescriptor<TDocument> Indices(Elastic.Clients.Ela
845861

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

864+
private Elastic.Clients.Elasticsearch.KnnQuery? KnnValue { get; set; }
865+
866+
private KnnQueryDescriptor<TDocument> KnnDescriptor { get; set; }
867+
868+
private Action<KnnQueryDescriptor<TDocument>> KnnDescriptorAction { get; set; }
869+
848870
private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilterValue { get; set; }
849871

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

1092+
public AsyncSearchSubmitRequestDescriptor<TDocument> Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn)
1093+
{
1094+
KnnDescriptor = null;
1095+
KnnDescriptorAction = null;
1096+
KnnValue = knn;
1097+
return Self;
1098+
}
1099+
1100+
public AsyncSearchSubmitRequestDescriptor<TDocument> Knn(KnnQueryDescriptor<TDocument> descriptor)
1101+
{
1102+
KnnValue = null;
1103+
KnnDescriptorAction = null;
1104+
KnnDescriptor = descriptor;
1105+
return Self;
1106+
}
1107+
1108+
public AsyncSearchSubmitRequestDescriptor<TDocument> Knn(Action<KnnQueryDescriptor<TDocument>> configure)
1109+
{
1110+
KnnValue = null;
1111+
KnnDescriptor = null;
1112+
KnnDescriptorAction = configure;
1113+
return Self;
1114+
}
1115+
10701116
public AsyncSearchSubmitRequestDescriptor<TDocument> PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? postFilter)
10711117
{
10721118
PostFilterDescriptor = null;
@@ -1462,6 +1508,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
14621508
JsonSerializer.Serialize(writer, HighlightValue, options);
14631509
}
14641510

1511+
if (KnnDescriptor is not null)
1512+
{
1513+
writer.WritePropertyName("knn");
1514+
JsonSerializer.Serialize(writer, KnnDescriptor, options);
1515+
}
1516+
else if (KnnDescriptorAction is not null)
1517+
{
1518+
writer.WritePropertyName("knn");
1519+
JsonSerializer.Serialize(writer, new KnnQueryDescriptor<TDocument>(KnnDescriptorAction), options);
1520+
}
1521+
else if (KnnValue is not null)
1522+
{
1523+
writer.WritePropertyName("knn");
1524+
JsonSerializer.Serialize(writer, KnnValue, options);
1525+
}
1526+
14651527
if (PostFilterDescriptor is not null)
14661528
{
14671529
writer.WritePropertyName("post_filter");
@@ -1779,6 +1841,12 @@ public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Elasticsearch.
17791841

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

1844+
private Elastic.Clients.Elasticsearch.KnnQuery? KnnValue { get; set; }
1845+
1846+
private KnnQueryDescriptor KnnDescriptor { get; set; }
1847+
1848+
private Action<KnnQueryDescriptor> KnnDescriptorAction { get; set; }
1849+
17821850
private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilterValue { get; set; }
17831851

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

2072+
public AsyncSearchSubmitRequestDescriptor Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn)
2073+
{
2074+
KnnDescriptor = null;
2075+
KnnDescriptorAction = null;
2076+
KnnValue = knn;
2077+
return Self;
2078+
}
2079+
2080+
public AsyncSearchSubmitRequestDescriptor Knn(KnnQueryDescriptor descriptor)
2081+
{
2082+
KnnValue = null;
2083+
KnnDescriptorAction = null;
2084+
KnnDescriptor = descriptor;
2085+
return Self;
2086+
}
2087+
2088+
public AsyncSearchSubmitRequestDescriptor Knn(Action<KnnQueryDescriptor> configure)
2089+
{
2090+
KnnValue = null;
2091+
KnnDescriptor = null;
2092+
KnnDescriptorAction = configure;
2093+
return Self;
2094+
}
2095+
20042096
public AsyncSearchSubmitRequestDescriptor PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? postFilter)
20052097
{
20062098
PostFilterDescriptor = null;
@@ -2402,6 +2494,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
24022494
JsonSerializer.Serialize(writer, HighlightValue, options);
24032495
}
24042496

2497+
if (KnnDescriptor is not null)
2498+
{
2499+
writer.WritePropertyName("knn");
2500+
JsonSerializer.Serialize(writer, KnnDescriptor, options);
2501+
}
2502+
else if (KnnDescriptorAction is not null)
2503+
{
2504+
writer.WritePropertyName("knn");
2505+
JsonSerializer.Serialize(writer, new KnnQueryDescriptor(KnnDescriptorAction), options);
2506+
}
2507+
else if (KnnValue is not null)
2508+
{
2509+
writer.WritePropertyName("knn");
2510+
JsonSerializer.Serialize(writer, KnnValue, options);
2511+
}
2512+
24052513
if (PostFilterDescriptor is not null)
24062514
{
24072515
writer.WritePropertyName("post_filter");

‎src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,12 @@ public override SearchRequest Read(ref Utf8JsonReader reader, Type typeToConvert
181181
continue;
182182
}
183183

184+
if (property == "knn")
185+
{
186+
variant.Knn = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.KnnQuery?>(ref reader, options);
187+
continue;
188+
}
189+
184190
if (property == "min_score")
185191
{
186192
variant.MinScore = JsonSerializer.Deserialize<double?>(ref reader, options);
@@ -375,6 +381,12 @@ public override void Write(Utf8JsonWriter writer, SearchRequest value, JsonSeria
375381
JsonSerializer.Serialize(writer, value.DocvalueFields, options);
376382
}
377383

384+
if (value.Knn is not null)
385+
{
386+
writer.WritePropertyName("knn");
387+
JsonSerializer.Serialize(writer, value.Knn, options);
388+
}
389+
378390
if (value.MinScore.HasValue)
379391
{
380392
writer.WritePropertyName("min_score");
@@ -648,6 +660,10 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
648660
[JsonPropertyName("docvalue_fields")]
649661
public IEnumerable<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFields { get; set; }
650662

663+
[JsonInclude]
664+
[JsonPropertyName("knn")]
665+
public Elastic.Clients.Elasticsearch.KnnQuery? Knn { get; set; }
666+
651667
[JsonInclude]
652668
[JsonPropertyName("min_score")]
653669
public double? MinScore { get; set; }
@@ -828,6 +844,12 @@ public SearchRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.
828844

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

847+
private Elastic.Clients.Elasticsearch.KnnQuery? KnnValue { get; set; }
848+
849+
private KnnQueryDescriptor<TDocument> KnnDescriptor { get; set; }
850+
851+
private Action<KnnQueryDescriptor<TDocument>> KnnDescriptorAction { get; set; }
852+
831853
private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilterValue { get; set; }
832854

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

1075+
public SearchRequestDescriptor<TDocument> Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn)
1076+
{
1077+
KnnDescriptor = null;
1078+
KnnDescriptorAction = null;
1079+
KnnValue = knn;
1080+
return Self;
1081+
}
1082+
1083+
public SearchRequestDescriptor<TDocument> Knn(KnnQueryDescriptor<TDocument> descriptor)
1084+
{
1085+
KnnValue = null;
1086+
KnnDescriptorAction = null;
1087+
KnnDescriptor = descriptor;
1088+
return Self;
1089+
}
1090+
1091+
public SearchRequestDescriptor<TDocument> Knn(Action<KnnQueryDescriptor<TDocument>> configure)
1092+
{
1093+
KnnValue = null;
1094+
KnnDescriptor = null;
1095+
KnnDescriptorAction = configure;
1096+
return Self;
1097+
}
1098+
10531099
public SearchRequestDescriptor<TDocument> PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? postFilter)
10541100
{
10551101
PostFilterDescriptor = null;
@@ -1445,6 +1491,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
14451491
JsonSerializer.Serialize(writer, HighlightValue, options);
14461492
}
14471493

1494+
if (KnnDescriptor is not null)
1495+
{
1496+
writer.WritePropertyName("knn");
1497+
JsonSerializer.Serialize(writer, KnnDescriptor, options);
1498+
}
1499+
else if (KnnDescriptorAction is not null)
1500+
{
1501+
writer.WritePropertyName("knn");
1502+
JsonSerializer.Serialize(writer, new KnnQueryDescriptor<TDocument>(KnnDescriptorAction), options);
1503+
}
1504+
else if (KnnValue is not null)
1505+
{
1506+
writer.WritePropertyName("knn");
1507+
JsonSerializer.Serialize(writer, KnnValue, options);
1508+
}
1509+
14481510
if (PostFilterDescriptor is not null)
14491511
{
14501512
writer.WritePropertyName("post_filter");
@@ -1763,6 +1825,12 @@ public SearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? in
17631825

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

1828+
private Elastic.Clients.Elasticsearch.KnnQuery? KnnValue { get; set; }
1829+
1830+
private KnnQueryDescriptor KnnDescriptor { get; set; }
1831+
1832+
private Action<KnnQueryDescriptor> KnnDescriptorAction { get; set; }
1833+
17661834
private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilterValue { get; set; }
17671835

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

2056+
public SearchRequestDescriptor Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn)
2057+
{
2058+
KnnDescriptor = null;
2059+
KnnDescriptorAction = null;
2060+
KnnValue = knn;
2061+
return Self;
2062+
}
2063+
2064+
public SearchRequestDescriptor Knn(KnnQueryDescriptor descriptor)
2065+
{
2066+
KnnValue = null;
2067+
KnnDescriptorAction = null;
2068+
KnnDescriptor = descriptor;
2069+
return Self;
2070+
}
2071+
2072+
public SearchRequestDescriptor Knn(Action<KnnQueryDescriptor> configure)
2073+
{
2074+
KnnValue = null;
2075+
KnnDescriptor = null;
2076+
KnnDescriptorAction = configure;
2077+
return Self;
2078+
}
2079+
19882080
public SearchRequestDescriptor PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? postFilter)
19892081
{
19902082
PostFilterDescriptor = null;
@@ -2386,6 +2478,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
23862478
JsonSerializer.Serialize(writer, HighlightValue, options);
23872479
}
23882480

2481+
if (KnnDescriptor is not null)
2482+
{
2483+
writer.WritePropertyName("knn");
2484+
JsonSerializer.Serialize(writer, KnnDescriptor, options);
2485+
}
2486+
else if (KnnDescriptorAction is not null)
2487+
{
2488+
writer.WritePropertyName("knn");
2489+
JsonSerializer.Serialize(writer, new KnnQueryDescriptor(KnnDescriptorAction), options);
2490+
}
2491+
else if (KnnValue is not null)
2492+
{
2493+
writer.WritePropertyName("knn");
2494+
JsonSerializer.Serialize(writer, KnnValue, options);
2495+
}
2496+
23892497
if (PostFilterDescriptor is not null)
23902498
{
23912499
writer.WritePropertyName("post_filter");

0 commit comments

Comments
 (0)