Skip to content

Fix breaking changes on the 7.x branch before release #4281

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
Dec 18, 2019
Merged

Fix breaking changes on the 7.x branch before release #4281

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
3 changes: 1 addition & 2 deletions src/CodeGeneration/ApiGenerator/Configuration/Overrides/GlobalOverrides.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ public class GlobalOverrides : EndpointOverridesBase
"copy_settings", //this still needs a PR?
"source", // allows the body to be specified as a request param, we do not want to advertise this with a strongly typed method
"timestamp",
"time",
"bytes"
"time"
};
}
}
49 changes: 49 additions & 0 deletions src/Elasticsearch.Net/Api/RequestParameters/RequestParameters.Cat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@ public bool? Verbose
public class CatAllocationRequestParameters : RequestParameters<CatAllocationRequestParameters>
{
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
///<summary>The unit in which to display byte values</summary>
public Bytes? Bytes
{
get => Q<Bytes? >("bytes");
set => Q("bytes", value);
}

///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public string Format
{
Expand Down Expand Up @@ -202,6 +209,13 @@ public bool? Verbose
public class CatFielddataRequestParameters : RequestParameters<CatFielddataRequestParameters>
{
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
///<summary>The unit in which to display byte values</summary>
public Bytes? Bytes
{
get => Q<Bytes? >("bytes");
set => Q("bytes", value);
}

///<summary>A comma-separated list of fields to return in the output</summary>
public string[] Fields
{
Expand Down Expand Up @@ -351,6 +365,13 @@ public string[] SortByColumns
public class CatIndicesRequestParameters : RequestParameters<CatIndicesRequestParameters>
{
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
///<summary>The unit in which to display byte values</summary>
public Bytes? Bytes
{
get => Q<Bytes? >("bytes");
set => Q("bytes", value);
}

///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public string Format
{
Expand Down Expand Up @@ -546,6 +567,13 @@ public bool? Verbose
public class CatNodesRequestParameters : RequestParameters<CatNodesRequestParameters>
{
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
///<summary>The unit in which to display byte values</summary>
public Bytes? Bytes
{
get => Q<Bytes? >("bytes");
set => Q("bytes", value);
}

///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public string Format
{
Expand Down Expand Up @@ -734,6 +762,13 @@ public bool? ActiveOnly
set => Q("active_only", value);
}

///<summary>The unit in which to display byte values</summary>
public Bytes? Bytes
{
get => Q<Bytes? >("bytes");
set => Q("bytes", value);
}

///<summary>If `true`, the response includes detailed information about shard recoveries</summary>
public bool? Detailed
{
Expand Down Expand Up @@ -857,6 +892,13 @@ public bool? Verbose
public class CatSegmentsRequestParameters : RequestParameters<CatSegmentsRequestParameters>
{
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
///<summary>The unit in which to display byte values</summary>
public Bytes? Bytes
{
get => Q<Bytes? >("bytes");
set => Q("bytes", value);
}

///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public string Format
{
Expand Down Expand Up @@ -901,6 +943,13 @@ public bool? Verbose
public class CatShardsRequestParameters : RequestParameters<CatShardsRequestParameters>
{
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
///<summary>The unit in which to display byte values</summary>
public Bytes? Bytes
{
get => Q<Bytes? >("bytes");
set => Q("bytes", value);
}

///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public string Format
{
Expand Down
14 changes: 14 additions & 0 deletions src/Nest/Descriptors.Cat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ public CatAllocationDescriptor(NodeIds nodeId): base(r => r.Optional("node_id",
///<summary>A comma-separated list of node IDs or names to limit the returned information</summary>
public CatAllocationDescriptor NodeId(NodeIds nodeId) => Assign(nodeId, (a, v) => a.RouteValues.Optional("node_id", v));
// Request parameters
///<summary>The unit in which to display byte values</summary>
public CatAllocationDescriptor Bytes(Bytes? bytes) => Qs("bytes", bytes);
///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public CatAllocationDescriptor Format(string format) => Qs("format", format);
///<summary>Comma-separated list of column names to display</summary>
Expand Down Expand Up @@ -165,6 +167,8 @@ public CatFielddataDescriptor(Fields fields): base(r => r.Optional("fields", fie
///<summary>A comma-separated list of fields to return the fielddata size</summary>
public CatFielddataDescriptor Fields<T>(params Expression<Func<T, object>>[] fields) => Assign(fields, (a, v) => a.RouteValues.Optional("fields", (Fields)v));
// Request parameters
///<summary>The unit in which to display byte values</summary>
public CatFielddataDescriptor Bytes(Bytes? bytes) => Qs("bytes", bytes);
///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public CatFielddataDescriptor Format(string format) => Qs("format", format);
///<summary>Comma-separated list of column names to display</summary>
Expand Down Expand Up @@ -242,6 +246,8 @@ public CatIndicesDescriptor Index<TOther>()
///<summary>A shortcut into calling Index(Indices.All)</summary>
public CatIndicesDescriptor AllIndices() => Index(Indices.All);
// Request parameters
///<summary>The unit in which to display byte values</summary>
public CatIndicesDescriptor Bytes(Bytes? bytes) => Qs("bytes", bytes);
///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public CatIndicesDescriptor Format(string format) => Qs("format", format);
///<summary>Comma-separated list of column names to display</summary>
Expand Down Expand Up @@ -314,6 +320,8 @@ public partial class CatNodesDescriptor : RequestDescriptorBase<CatNodesDescript
internal override ApiUrls ApiUrls => ApiUrlsLookups.CatNodes;
// values part of the url path
// Request parameters
///<summary>The unit in which to display byte values</summary>
public CatNodesDescriptor Bytes(Bytes? bytes) => Qs("bytes", bytes);
///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public CatNodesDescriptor Format(string format) => Qs("format", format);
///<summary>Return the full node ID instead of the shortened version (default: false)</summary>
Expand Down Expand Up @@ -403,6 +411,8 @@ public CatRecoveryDescriptor Index<TOther>()
// Request parameters
///<summary>If `true`, the response only includes ongoing shard recoveries</summary>
public CatRecoveryDescriptor ActiveOnly(bool? activeonly = true) => Qs("active_only", activeonly);
///<summary>The unit in which to display byte values</summary>
public CatRecoveryDescriptor Bytes(Bytes? bytes) => Qs("bytes", bytes);
///<summary>If `true`, the response includes detailed information about shard recoveries</summary>
public CatRecoveryDescriptor Detailed(bool? detailed = true) => Qs("detailed", detailed);
///<summary>a short version of the Accept header, e.g. json, yaml</summary>
Expand Down Expand Up @@ -466,6 +476,8 @@ public CatSegmentsDescriptor Index<TOther>()
///<summary>A shortcut into calling Index(Indices.All)</summary>
public CatSegmentsDescriptor AllIndices() => Index(Indices.All);
// Request parameters
///<summary>The unit in which to display byte values</summary>
public CatSegmentsDescriptor Bytes(Bytes? bytes) => Qs("bytes", bytes);
///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public CatSegmentsDescriptor Format(string format) => Qs("format", format);
///<summary>Comma-separated list of column names to display</summary>
Expand Down Expand Up @@ -503,6 +515,8 @@ public CatShardsDescriptor Index<TOther>()
///<summary>A shortcut into calling Index(Indices.All)</summary>
public CatShardsDescriptor AllIndices() => Index(Indices.All);
// Request parameters
///<summary>The unit in which to display byte values</summary>
public CatShardsDescriptor Bytes(Bytes? bytes) => Qs("bytes", bytes);
///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public CatShardsDescriptor Format(string format) => Qs("format", format);
///<summary>Comma-separated list of column names to display</summary>
Expand Down
49 changes: 49 additions & 0 deletions src/Nest/Requests.Cat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,13 @@ public CatAllocationRequest(NodeIds nodeId): base(r => r.Optional("node_id", nod
[IgnoreDataMember]
NodeIds ICatAllocationRequest.NodeId => Self.RouteValues.Get<NodeIds>("node_id");
// Request parameters
///<summary>The unit in which to display byte values</summary>
public Bytes? Bytes
{
get => Q<Bytes? >("bytes");
set => Q("bytes", value);
}

///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public string Format
{
Expand Down Expand Up @@ -313,6 +320,13 @@ public CatFielddataRequest(Fields fields): base(r => r.Optional("fields", fields
[IgnoreDataMember]
Fields ICatFielddataRequest.Fields => Self.RouteValues.Get<Fields>("fields");
// Request parameters
///<summary>The unit in which to display byte values</summary>
public Bytes? Bytes
{
get => Q<Bytes? >("bytes");
set => Q("bytes", value);
}

///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public string Format
{
Expand Down Expand Up @@ -497,6 +511,13 @@ public CatIndicesRequest(Indices index): base(r => r.Optional("index", index))
[IgnoreDataMember]
Indices ICatIndicesRequest.Index => Self.RouteValues.Get<Indices>("index");
// Request parameters
///<summary>The unit in which to display byte values</summary>
public Bytes? Bytes
{
get => Q<Bytes? >("bytes");
set => Q("bytes", value);
}

///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public string Format
{
Expand Down Expand Up @@ -716,6 +737,13 @@ public partial class CatNodesRequest : PlainRequestBase<CatNodesRequestParameter
internal override ApiUrls ApiUrls => ApiUrlsLookups.CatNodes;
// values part of the url path
// Request parameters
///<summary>The unit in which to display byte values</summary>
public Bytes? Bytes
{
get => Q<Bytes? >("bytes");
set => Q("bytes", value);
}

///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public string Format
{
Expand Down Expand Up @@ -946,6 +974,13 @@ public bool? ActiveOnly
set => Q("active_only", value);
}

///<summary>The unit in which to display byte values</summary>
public Bytes? Bytes
{
get => Q<Bytes? >("bytes");
set => Q("bytes", value);
}

///<summary>If `true`, the response includes detailed information about shard recoveries</summary>
public bool? Detailed
{
Expand Down Expand Up @@ -1096,6 +1131,13 @@ public CatSegmentsRequest(Indices index): base(r => r.Optional("index", index))
[IgnoreDataMember]
Indices ICatSegmentsRequest.Index => Self.RouteValues.Get<Indices>("index");
// Request parameters
///<summary>The unit in which to display byte values</summary>
public Bytes? Bytes
{
get => Q<Bytes? >("bytes");
set => Q("bytes", value);
}

///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public string Format
{
Expand Down Expand Up @@ -1166,6 +1208,13 @@ public CatShardsRequest(Indices index): base(r => r.Optional("index", index))
[IgnoreDataMember]
Indices ICatShardsRequest.Index => Self.RouteValues.Get<Indices>("index");
// Request parameters
///<summary>The unit in which to display byte values</summary>
public Bytes? Bytes
{
get => Q<Bytes? >("bytes");
set => Q("bytes", value);
}

///<summary>a short version of the Accept header, e.g. json, yaml</summary>
public string Format
{
Expand Down