Skip to content

Commit 312c271

Browse files
authored
Regnerate NEST client using code-gen (#5990)
1 parent f319359 commit 312c271

9 files changed

+38
-36
lines changed

src/Nest/Descriptors.Indices.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ public DeleteIndexDescriptor Index<TOther>()
321321
// Request parameters
322322
///<summary>Ignore if a wildcard expression resolves to no concrete indices (default: false)</summary>
323323
public DeleteIndexDescriptor AllowNoIndices(bool? allownoindices = true) => Qs("allow_no_indices", allownoindices);
324-
///<summary>Whether wildcard expressions should get expanded to open or closed indices (default: open)</summary>
324+
///<summary>Whether wildcard expressions should get expanded to open, closed, or hidden indices</summary>
325325
public DeleteIndexDescriptor ExpandWildcards(ExpandWildcards? expandwildcards) => Qs("expand_wildcards", expandwildcards);
326326
///<summary>Ignore unavailable indexes (default: false)</summary>
327327
public DeleteIndexDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable);

src/Nest/Descriptors.NoNamespace.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,24 +1108,25 @@ public MultiTermVectorsDescriptor Fields<T>(params Expression<Func<T, object>>[]
11081108
public partial class OpenPointInTimeDescriptor : RequestDescriptorBase<OpenPointInTimeDescriptor, OpenPointInTimeRequestParameters, IOpenPointInTimeRequest>, IOpenPointInTimeRequest
11091109
{
11101110
internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceOpenPointInTime;
1111-
///<summary>/_pit</summary>
1112-
public OpenPointInTimeDescriptor(): base()
1111+
///<summary>/{index}/_pit</summary>
1112+
///<param name = "index">this parameter is required</param>
1113+
public OpenPointInTimeDescriptor(Indices index): base(r => r.Required("index", index))
11131114
{
11141115
}
11151116

1116-
///<summary>/{index}/_pit</summary>
1117-
///<param name = "index">Optional, accepts null</param>
1118-
public OpenPointInTimeDescriptor(Indices index): base(r => r.Optional("index", index))
1117+
///<summary>Used for serialization purposes, making sure we have a parameterless constructor</summary>
1118+
[SerializationConstructor]
1119+
protected OpenPointInTimeDescriptor(): base()
11191120
{
11201121
}
11211122

11221123
// values part of the url path
11231124
Indices IOpenPointInTimeRequest.Index => Self.RouteValues.Get<Indices>("index");
11241125
///<summary>A comma-separated list of index names to open point in time; use the special string `_all` or Indices.All to perform the operation on all indices</summary>
1125-
public OpenPointInTimeDescriptor Index(Indices index) => Assign(index, (a, v) => a.RouteValues.Optional("index", v));
1126+
public OpenPointInTimeDescriptor Index(Indices index) => Assign(index, (a, v) => a.RouteValues.Required("index", v));
11261127
///<summary>a shortcut into calling Index(typeof(TOther))</summary>
11271128
public OpenPointInTimeDescriptor Index<TOther>()
1128-
where TOther : class => Assign(typeof(TOther), (a, v) => a.RouteValues.Optional("index", (Indices)v));
1129+
where TOther : class => Assign(typeof(TOther), (a, v) => a.RouteValues.Required("index", (Indices)v));
11291130
///<summary>A shortcut into calling Index(Indices.All)</summary>
11301131
public OpenPointInTimeDescriptor AllIndices() => Index(Indices.All);
11311132
// Request parameters

src/Nest/Descriptors.Sql.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
// ReSharper disable RedundantNameQualifier
3434
namespace Nest
3535
{
36-
///<summary>Descriptor for ClearCursor <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html</para></summary>
36+
///<summary>Descriptor for ClearCursor <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html</para></summary>
3737
public partial class ClearSqlCursorDescriptor : RequestDescriptorBase<ClearSqlCursorDescriptor, ClearSqlCursorRequestParameters, IClearSqlCursorRequest>, IClearSqlCursorRequest
3838
{
3939
internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlClearCursor;
@@ -112,7 +112,7 @@ protected SqlSearchStatusDescriptor(): base()
112112
// Request parameters
113113
}
114114

115-
///<summary>Descriptor for Query <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html</para></summary>
115+
///<summary>Descriptor for Query <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html</para></summary>
116116
public partial class QuerySqlDescriptor : RequestDescriptorBase<QuerySqlDescriptor, QuerySqlRequestParameters, IQuerySqlRequest>, IQuerySqlRequest
117117
{
118118
internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlQuery;
@@ -122,7 +122,7 @@ public partial class QuerySqlDescriptor : RequestDescriptorBase<QuerySqlDescript
122122
public QuerySqlDescriptor Format(string format) => Qs("format", format);
123123
}
124124

125-
///<summary>Descriptor for Translate <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html</para></summary>
125+
///<summary>Descriptor for Translate <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html</para></summary>
126126
public partial class TranslateSqlDescriptor : RequestDescriptorBase<TranslateSqlDescriptor, TranslateSqlRequestParameters, ITranslateSqlRequest>, ITranslateSqlRequest
127127
{
128128
internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlTranslate;

src/Nest/ElasticClient.NoNamespace.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -814,13 +814,13 @@ public Task<IndexResponse> IndexAsync<TDocument>(IIndexRequest<TDocument> reques
814814
/// <para></para>
815815
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html</a>
816816
/// </summary>
817-
public OpenPointInTimeResponse OpenPointInTime(Indices index = null, Func<OpenPointInTimeDescriptor, IOpenPointInTimeRequest> selector = null) => OpenPointInTime(selector.InvokeOrDefault(new OpenPointInTimeDescriptor().Index(index: index)));
817+
public OpenPointInTimeResponse OpenPointInTime(Indices index, Func<OpenPointInTimeDescriptor, IOpenPointInTimeRequest> selector = null) => OpenPointInTime(selector.InvokeOrDefault(new OpenPointInTimeDescriptor(index: index)));
818818
/// <summary>
819819
/// <c>POST</c> request to the <c>open_point_in_time</c> API, read more about this API online:
820820
/// <para></para>
821821
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html</a>
822822
/// </summary>
823-
public Task<OpenPointInTimeResponse> OpenPointInTimeAsync(Indices index = null, Func<OpenPointInTimeDescriptor, IOpenPointInTimeRequest> selector = null, CancellationToken ct = default) => OpenPointInTimeAsync(selector.InvokeOrDefault(new OpenPointInTimeDescriptor().Index(index: index)), ct);
823+
public Task<OpenPointInTimeResponse> OpenPointInTimeAsync(Indices index, Func<OpenPointInTimeDescriptor, IOpenPointInTimeRequest> selector = null, CancellationToken ct = default) => OpenPointInTimeAsync(selector.InvokeOrDefault(new OpenPointInTimeDescriptor(index: index)), ct);
824824
/// <summary>
825825
/// <c>POST</c> request to the <c>open_point_in_time</c> API, read more about this API online:
826826
/// <para></para>

src/Nest/ElasticClient.Sql.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,25 @@ internal SqlNamespace(ElasticClient client): base(client)
4242
/// <summary>
4343
/// <c>POST</c> request to the <c>sql.clear_cursor</c> API, read more about this API online:
4444
/// <para></para>
45-
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html</a>
45+
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html</a>
4646
/// </summary>
4747
public ClearSqlCursorResponse ClearCursor(Func<ClearSqlCursorDescriptor, IClearSqlCursorRequest> selector) => ClearCursor(selector.InvokeOrDefault(new ClearSqlCursorDescriptor()));
4848
/// <summary>
4949
/// <c>POST</c> request to the <c>sql.clear_cursor</c> API, read more about this API online:
5050
/// <para></para>
51-
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html</a>
51+
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html</a>
5252
/// </summary>
5353
public Task<ClearSqlCursorResponse> ClearCursorAsync(Func<ClearSqlCursorDescriptor, IClearSqlCursorRequest> selector, CancellationToken ct = default) => ClearCursorAsync(selector.InvokeOrDefault(new ClearSqlCursorDescriptor()), ct);
5454
/// <summary>
5555
/// <c>POST</c> request to the <c>sql.clear_cursor</c> API, read more about this API online:
5656
/// <para></para>
57-
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html</a>
57+
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html</a>
5858
/// </summary>
5959
public ClearSqlCursorResponse ClearCursor(IClearSqlCursorRequest request) => DoRequest<IClearSqlCursorRequest, ClearSqlCursorResponse>(request, request.RequestParameters);
6060
/// <summary>
6161
/// <c>POST</c> request to the <c>sql.clear_cursor</c> API, read more about this API online:
6262
/// <para></para>
63-
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html</a>
63+
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html</a>
6464
/// </summary>
6565
public Task<ClearSqlCursorResponse> ClearCursorAsync(IClearSqlCursorRequest request, CancellationToken ct = default) => DoRequestAsync<IClearSqlCursorRequest, ClearSqlCursorResponse>(request, request.RequestParameters, ct);
6666
/// <summary>
@@ -138,49 +138,49 @@ internal SqlNamespace(ElasticClient client): base(client)
138138
/// <summary>
139139
/// <c>POST</c> request to the <c>sql.query</c> API, read more about this API online:
140140
/// <para></para>
141-
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html</a>
141+
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html</a>
142142
/// </summary>
143143
public QuerySqlResponse Query(Func<QuerySqlDescriptor, IQuerySqlRequest> selector = null) => Query(selector.InvokeOrDefault(new QuerySqlDescriptor()));
144144
/// <summary>
145145
/// <c>POST</c> request to the <c>sql.query</c> API, read more about this API online:
146146
/// <para></para>
147-
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html</a>
147+
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html</a>
148148
/// </summary>
149149
public Task<QuerySqlResponse> QueryAsync(Func<QuerySqlDescriptor, IQuerySqlRequest> selector = null, CancellationToken ct = default) => QueryAsync(selector.InvokeOrDefault(new QuerySqlDescriptor()), ct);
150150
/// <summary>
151151
/// <c>POST</c> request to the <c>sql.query</c> API, read more about this API online:
152152
/// <para></para>
153-
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html</a>
153+
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html</a>
154154
/// </summary>
155155
public QuerySqlResponse Query(IQuerySqlRequest request) => DoRequest<IQuerySqlRequest, QuerySqlResponse>(request, request.RequestParameters);
156156
/// <summary>
157157
/// <c>POST</c> request to the <c>sql.query</c> API, read more about this API online:
158158
/// <para></para>
159-
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html</a>
159+
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html</a>
160160
/// </summary>
161161
public Task<QuerySqlResponse> QueryAsync(IQuerySqlRequest request, CancellationToken ct = default) => DoRequestAsync<IQuerySqlRequest, QuerySqlResponse>(request, request.RequestParameters, ct);
162162
/// <summary>
163163
/// <c>POST</c> request to the <c>sql.translate</c> API, read more about this API online:
164164
/// <para></para>
165-
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html</a>
165+
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html</a>
166166
/// </summary>
167167
public TranslateSqlResponse Translate(Func<TranslateSqlDescriptor, ITranslateSqlRequest> selector = null) => Translate(selector.InvokeOrDefault(new TranslateSqlDescriptor()));
168168
/// <summary>
169169
/// <c>POST</c> request to the <c>sql.translate</c> API, read more about this API online:
170170
/// <para></para>
171-
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html</a>
171+
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html</a>
172172
/// </summary>
173173
public Task<TranslateSqlResponse> TranslateAsync(Func<TranslateSqlDescriptor, ITranslateSqlRequest> selector = null, CancellationToken ct = default) => TranslateAsync(selector.InvokeOrDefault(new TranslateSqlDescriptor()), ct);
174174
/// <summary>
175175
/// <c>POST</c> request to the <c>sql.translate</c> API, read more about this API online:
176176
/// <para></para>
177-
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html</a>
177+
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html</a>
178178
/// </summary>
179179
public TranslateSqlResponse Translate(ITranslateSqlRequest request) => DoRequest<ITranslateSqlRequest, TranslateSqlResponse>(request, request.RequestParameters);
180180
/// <summary>
181181
/// <c>POST</c> request to the <c>sql.translate</c> API, read more about this API online:
182182
/// <para></para>
183-
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html</a>
183+
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html</a>
184184
/// </summary>
185185
public Task<TranslateSqlResponse> TranslateAsync(ITranslateSqlRequest request, CancellationToken ct = default) => DoRequestAsync<ITranslateSqlRequest, TranslateSqlResponse>(request, request.RequestParameters, ct);
186186
}

src/Nest/IElasticClient.Generated.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -709,13 +709,13 @@ Task<IndexResponse> IndexAsync<TDocument>(IIndexRequest<TDocument> request, Canc
709709
/// <para></para>
710710
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html</a>
711711
/// </summary>
712-
OpenPointInTimeResponse OpenPointInTime(Indices index = null, Func<OpenPointInTimeDescriptor, IOpenPointInTimeRequest> selector = null);
712+
OpenPointInTimeResponse OpenPointInTime(Indices index, Func<OpenPointInTimeDescriptor, IOpenPointInTimeRequest> selector = null);
713713
/// <summary>
714714
/// <c>POST</c> request to the <c>open_point_in_time</c> API, read more about this API online:
715715
/// <para></para>
716716
/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html">https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html</a>
717717
/// </summary>
718-
Task<OpenPointInTimeResponse> OpenPointInTimeAsync(Indices index = null, Func<OpenPointInTimeDescriptor, IOpenPointInTimeRequest> selector = null, CancellationToken ct = default);
718+
Task<OpenPointInTimeResponse> OpenPointInTimeAsync(Indices index, Func<OpenPointInTimeDescriptor, IOpenPointInTimeRequest> selector = null, CancellationToken ct = default);
719719
/// <summary>
720720
/// <c>POST</c> request to the <c>open_point_in_time</c> API, read more about this API online:
721721
/// <para></para>

src/Nest/Requests.Indices.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ public bool? AllowNoIndices
533533
set => Q("allow_no_indices", value);
534534
}
535535

536-
///<summary>Whether wildcard expressions should get expanded to open or closed indices (default: open)</summary>
536+
///<summary>Whether wildcard expressions should get expanded to open, closed, or hidden indices</summary>
537537
public ExpandWildcards? ExpandWildcards
538538
{
539539
get => Q<ExpandWildcards? >("expand_wildcards");

src/Nest/Requests.NoNamespace.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2368,14 +2368,15 @@ public partial class OpenPointInTimeRequest : PlainRequestBase<OpenPointInTimeRe
23682368
{
23692369
protected IOpenPointInTimeRequest Self => this;
23702370
internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceOpenPointInTime;
2371-
///<summary>/_pit</summary>
2372-
public OpenPointInTimeRequest(): base()
2371+
///<summary>/{index}/_pit</summary>
2372+
///<param name = "index">this parameter is required</param>
2373+
public OpenPointInTimeRequest(Indices index): base(r => r.Required("index", index))
23732374
{
23742375
}
23752376

2376-
///<summary>/{index}/_pit</summary>
2377-
///<param name = "index">Optional, accepts null</param>
2378-
public OpenPointInTimeRequest(Indices index): base(r => r.Optional("index", index))
2377+
///<summary>Used for serialization purposes, making sure we have a parameterless constructor</summary>
2378+
[SerializationConstructor]
2379+
protected OpenPointInTimeRequest(): base()
23792380
{
23802381
}
23812382

src/Nest/Requests.Sql.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public partial interface IClearSqlCursorRequest : IRequest<ClearSqlCursorRequest
3939
{
4040
}
4141

42-
///<summary>Request for ClearCursor <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html</para></summary>
42+
///<summary>Request for ClearCursor <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html</para></summary>
4343
public partial class ClearSqlCursorRequest : PlainRequestBase<ClearSqlCursorRequestParameters>, IClearSqlCursorRequest
4444
{
4545
protected IClearSqlCursorRequest Self => this;
@@ -179,7 +179,7 @@ public partial interface IQuerySqlRequest : IRequest<QuerySqlRequestParameters>
179179
{
180180
}
181181

182-
///<summary>Request for Query <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html</para></summary>
182+
///<summary>Request for Query <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html</para></summary>
183183
public partial class QuerySqlRequest : PlainRequestBase<QuerySqlRequestParameters>, IQuerySqlRequest
184184
{
185185
protected IQuerySqlRequest Self => this;
@@ -199,7 +199,7 @@ public partial interface ITranslateSqlRequest : IRequest<TranslateSqlRequestPara
199199
{
200200
}
201201

202-
///<summary>Request for Translate <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html</para></summary>
202+
///<summary>Request for Translate <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html</para></summary>
203203
public partial class TranslateSqlRequest : PlainRequestBase<TranslateSqlRequestParameters>, ITranslateSqlRequest
204204
{
205205
protected ITranslateSqlRequest Self => this;

0 commit comments

Comments
 (0)