From 5e79b0cf93d6ab4d00c528125619aa8d8756e83e Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Tue, 21 Sep 2021 10:36:33 +0100 Subject: [PATCH] Regnerate NEST client using code-gen --- src/Nest/Descriptors.Indices.cs | 2 +- src/Nest/Descriptors.NoNamespace.cs | 15 ++++++++------- src/Nest/Descriptors.Sql.cs | 6 +++--- src/Nest/ElasticClient.NoNamespace.cs | 4 ++-- src/Nest/ElasticClient.Sql.cs | 24 ++++++++++++------------ src/Nest/IElasticClient.Generated.cs | 4 ++-- src/Nest/Requests.Indices.cs | 2 +- src/Nest/Requests.NoNamespace.cs | 11 ++++++----- src/Nest/Requests.Sql.cs | 6 +++--- 9 files changed, 38 insertions(+), 36 deletions(-) diff --git a/src/Nest/Descriptors.Indices.cs b/src/Nest/Descriptors.Indices.cs index 19f59b7db37..f565d19e512 100644 --- a/src/Nest/Descriptors.Indices.cs +++ b/src/Nest/Descriptors.Indices.cs @@ -321,7 +321,7 @@ public DeleteIndexDescriptor Index() // Request parameters ///Ignore if a wildcard expression resolves to no concrete indices (default: false) public DeleteIndexDescriptor AllowNoIndices(bool? allownoindices = true) => Qs("allow_no_indices", allownoindices); - ///Whether wildcard expressions should get expanded to open or closed indices (default: open) + ///Whether wildcard expressions should get expanded to open, closed, or hidden indices public DeleteIndexDescriptor ExpandWildcards(ExpandWildcards? expandwildcards) => Qs("expand_wildcards", expandwildcards); ///Ignore unavailable indexes (default: false) public DeleteIndexDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); diff --git a/src/Nest/Descriptors.NoNamespace.cs b/src/Nest/Descriptors.NoNamespace.cs index 47264088991..bef0928b0c1 100644 --- a/src/Nest/Descriptors.NoNamespace.cs +++ b/src/Nest/Descriptors.NoNamespace.cs @@ -1108,24 +1108,25 @@ public MultiTermVectorsDescriptor Fields(params Expression>[] public partial class OpenPointInTimeDescriptor : RequestDescriptorBase, IOpenPointInTimeRequest { internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceOpenPointInTime; - ////_pit - public OpenPointInTimeDescriptor(): base() + ////{index}/_pit + ///this parameter is required + public OpenPointInTimeDescriptor(Indices index): base(r => r.Required("index", index)) { } - ////{index}/_pit - ///Optional, accepts null - public OpenPointInTimeDescriptor(Indices index): base(r => r.Optional("index", index)) + ///Used for serialization purposes, making sure we have a parameterless constructor + [SerializationConstructor] + protected OpenPointInTimeDescriptor(): base() { } // values part of the url path Indices IOpenPointInTimeRequest.Index => Self.RouteValues.Get("index"); ///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 - public OpenPointInTimeDescriptor Index(Indices index) => Assign(index, (a, v) => a.RouteValues.Optional("index", v)); + public OpenPointInTimeDescriptor Index(Indices index) => Assign(index, (a, v) => a.RouteValues.Required("index", v)); ///a shortcut into calling Index(typeof(TOther)) public OpenPointInTimeDescriptor Index() - where TOther : class => Assign(typeof(TOther), (a, v) => a.RouteValues.Optional("index", (Indices)v)); + where TOther : class => Assign(typeof(TOther), (a, v) => a.RouteValues.Required("index", (Indices)v)); ///A shortcut into calling Index(Indices.All) public OpenPointInTimeDescriptor AllIndices() => Index(Indices.All); // Request parameters diff --git a/src/Nest/Descriptors.Sql.cs b/src/Nest/Descriptors.Sql.cs index 9a80bf1bc9b..4dbd324f1bf 100644 --- a/src/Nest/Descriptors.Sql.cs +++ b/src/Nest/Descriptors.Sql.cs @@ -33,7 +33,7 @@ // ReSharper disable RedundantNameQualifier namespace Nest { - ///Descriptor for ClearCursor https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html + ///Descriptor for ClearCursor https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html public partial class ClearSqlCursorDescriptor : RequestDescriptorBase, IClearSqlCursorRequest { internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlClearCursor; @@ -112,7 +112,7 @@ protected SqlSearchStatusDescriptor(): base() // Request parameters } - ///Descriptor for Query https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html + ///Descriptor for Query https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html public partial class QuerySqlDescriptor : RequestDescriptorBase, IQuerySqlRequest { internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlQuery; @@ -122,7 +122,7 @@ public partial class QuerySqlDescriptor : RequestDescriptorBase Qs("format", format); } - ///Descriptor for Translate https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html + ///Descriptor for Translate https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html public partial class TranslateSqlDescriptor : RequestDescriptorBase, ITranslateSqlRequest { internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlTranslate; diff --git a/src/Nest/ElasticClient.NoNamespace.cs b/src/Nest/ElasticClient.NoNamespace.cs index 1caf5079d32..776bf8469f4 100644 --- a/src/Nest/ElasticClient.NoNamespace.cs +++ b/src/Nest/ElasticClient.NoNamespace.cs @@ -814,13 +814,13 @@ public Task IndexAsync(IIndexRequest reques /// /// https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html /// - public OpenPointInTimeResponse OpenPointInTime(Indices index = null, Func selector = null) => OpenPointInTime(selector.InvokeOrDefault(new OpenPointInTimeDescriptor().Index(index: index))); + public OpenPointInTimeResponse OpenPointInTime(Indices index, Func selector = null) => OpenPointInTime(selector.InvokeOrDefault(new OpenPointInTimeDescriptor(index: index))); /// /// POST request to the open_point_in_time API, read more about this API online: /// /// https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html /// - public Task OpenPointInTimeAsync(Indices index = null, Func selector = null, CancellationToken ct = default) => OpenPointInTimeAsync(selector.InvokeOrDefault(new OpenPointInTimeDescriptor().Index(index: index)), ct); + public Task OpenPointInTimeAsync(Indices index, Func selector = null, CancellationToken ct = default) => OpenPointInTimeAsync(selector.InvokeOrDefault(new OpenPointInTimeDescriptor(index: index)), ct); /// /// POST request to the open_point_in_time API, read more about this API online: /// diff --git a/src/Nest/ElasticClient.Sql.cs b/src/Nest/ElasticClient.Sql.cs index 58a30885898..6ed86561348 100644 --- a/src/Nest/ElasticClient.Sql.cs +++ b/src/Nest/ElasticClient.Sql.cs @@ -42,25 +42,25 @@ internal SqlNamespace(ElasticClient client): base(client) /// /// POST request to the sql.clear_cursor API, read more about this API online: /// - /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html + /// https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html /// public ClearSqlCursorResponse ClearCursor(Func selector) => ClearCursor(selector.InvokeOrDefault(new ClearSqlCursorDescriptor())); /// /// POST request to the sql.clear_cursor API, read more about this API online: /// - /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html + /// https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html /// public Task ClearCursorAsync(Func selector, CancellationToken ct = default) => ClearCursorAsync(selector.InvokeOrDefault(new ClearSqlCursorDescriptor()), ct); /// /// POST request to the sql.clear_cursor API, read more about this API online: /// - /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html + /// https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html /// public ClearSqlCursorResponse ClearCursor(IClearSqlCursorRequest request) => DoRequest(request, request.RequestParameters); /// /// POST request to the sql.clear_cursor API, read more about this API online: /// - /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html + /// https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html /// public Task ClearCursorAsync(IClearSqlCursorRequest request, CancellationToken ct = default) => DoRequestAsync(request, request.RequestParameters, ct); /// @@ -138,49 +138,49 @@ internal SqlNamespace(ElasticClient client): base(client) /// /// POST request to the sql.query API, read more about this API online: /// - /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html + /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html /// public QuerySqlResponse Query(Func selector = null) => Query(selector.InvokeOrDefault(new QuerySqlDescriptor())); /// /// POST request to the sql.query API, read more about this API online: /// - /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html + /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html /// public Task QueryAsync(Func selector = null, CancellationToken ct = default) => QueryAsync(selector.InvokeOrDefault(new QuerySqlDescriptor()), ct); /// /// POST request to the sql.query API, read more about this API online: /// - /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html + /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html /// public QuerySqlResponse Query(IQuerySqlRequest request) => DoRequest(request, request.RequestParameters); /// /// POST request to the sql.query API, read more about this API online: /// - /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html + /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html /// public Task QueryAsync(IQuerySqlRequest request, CancellationToken ct = default) => DoRequestAsync(request, request.RequestParameters, ct); /// /// POST request to the sql.translate API, read more about this API online: /// - /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html + /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html /// public TranslateSqlResponse Translate(Func selector = null) => Translate(selector.InvokeOrDefault(new TranslateSqlDescriptor())); /// /// POST request to the sql.translate API, read more about this API online: /// - /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html + /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html /// public Task TranslateAsync(Func selector = null, CancellationToken ct = default) => TranslateAsync(selector.InvokeOrDefault(new TranslateSqlDescriptor()), ct); /// /// POST request to the sql.translate API, read more about this API online: /// - /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html + /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html /// public TranslateSqlResponse Translate(ITranslateSqlRequest request) => DoRequest(request, request.RequestParameters); /// /// POST request to the sql.translate API, read more about this API online: /// - /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html + /// https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html /// public Task TranslateAsync(ITranslateSqlRequest request, CancellationToken ct = default) => DoRequestAsync(request, request.RequestParameters, ct); } diff --git a/src/Nest/IElasticClient.Generated.cs b/src/Nest/IElasticClient.Generated.cs index a22598d9c0f..a133fbed408 100644 --- a/src/Nest/IElasticClient.Generated.cs +++ b/src/Nest/IElasticClient.Generated.cs @@ -709,13 +709,13 @@ Task IndexAsync(IIndexRequest request, Canc /// /// https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html /// - OpenPointInTimeResponse OpenPointInTime(Indices index = null, Func selector = null); + OpenPointInTimeResponse OpenPointInTime(Indices index, Func selector = null); /// /// POST request to the open_point_in_time API, read more about this API online: /// /// https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html /// - Task OpenPointInTimeAsync(Indices index = null, Func selector = null, CancellationToken ct = default); + Task OpenPointInTimeAsync(Indices index, Func selector = null, CancellationToken ct = default); /// /// POST request to the open_point_in_time API, read more about this API online: /// diff --git a/src/Nest/Requests.Indices.cs b/src/Nest/Requests.Indices.cs index 13239b32095..afcabace80c 100644 --- a/src/Nest/Requests.Indices.cs +++ b/src/Nest/Requests.Indices.cs @@ -533,7 +533,7 @@ public bool? AllowNoIndices set => Q("allow_no_indices", value); } - ///Whether wildcard expressions should get expanded to open or closed indices (default: open) + ///Whether wildcard expressions should get expanded to open, closed, or hidden indices public ExpandWildcards? ExpandWildcards { get => Q("expand_wildcards"); diff --git a/src/Nest/Requests.NoNamespace.cs b/src/Nest/Requests.NoNamespace.cs index 52447f9b72b..9cca471f3d7 100644 --- a/src/Nest/Requests.NoNamespace.cs +++ b/src/Nest/Requests.NoNamespace.cs @@ -2368,14 +2368,15 @@ public partial class OpenPointInTimeRequest : PlainRequestBase this; internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceOpenPointInTime; - ////_pit - public OpenPointInTimeRequest(): base() + ////{index}/_pit + ///this parameter is required + public OpenPointInTimeRequest(Indices index): base(r => r.Required("index", index)) { } - ////{index}/_pit - ///Optional, accepts null - public OpenPointInTimeRequest(Indices index): base(r => r.Optional("index", index)) + ///Used for serialization purposes, making sure we have a parameterless constructor + [SerializationConstructor] + protected OpenPointInTimeRequest(): base() { } diff --git a/src/Nest/Requests.Sql.cs b/src/Nest/Requests.Sql.cs index 23afaaac21a..d2282b79895 100644 --- a/src/Nest/Requests.Sql.cs +++ b/src/Nest/Requests.Sql.cs @@ -39,7 +39,7 @@ public partial interface IClearSqlCursorRequest : IRequestRequest for ClearCursor https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-pagination.html + ///Request for ClearCursor https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html public partial class ClearSqlCursorRequest : PlainRequestBase, IClearSqlCursorRequest { protected IClearSqlCursorRequest Self => this; @@ -179,7 +179,7 @@ public partial interface IQuerySqlRequest : IRequest { } - ///Request for Query https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html + ///Request for Query https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html public partial class QuerySqlRequest : PlainRequestBase, IQuerySqlRequest { protected IQuerySqlRequest Self => this; @@ -199,7 +199,7 @@ public partial interface ITranslateSqlRequest : IRequestRequest for Translate https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate.html + ///Request for Translate https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html public partial class TranslateSqlRequest : PlainRequestBase, ITranslateSqlRequest { protected ITranslateSqlRequest Self => this;