Skip to content

Commit 40909a3

Browse files
github-actions[bot]stevejgordon
github-actions[bot]
and
stevejgordon
authored
Prefer ICollection over IList for request properties (#6902) (#6903)
Co-authored-by: Steve Gordon <sgordon@hotmail.co.uk>
1 parent ec0f2a6 commit 40909a3

File tree

118 files changed

+724
-738
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+724
-738
lines changed

‎src/Elastic.Clients.Elasticsearch/Serialization/IEnumerableSingleOrManyConverter.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
namespace Elastic.Clients.Elasticsearch.Serialization;
1111

12-
internal abstract class IEnumerableSingleOrManyConverter<TItem> : JsonConverter<IList<TItem>>
12+
internal abstract class ICollectionSingleOrManyConverter<TItem> : JsonConverter<ICollection<TItem>>
1313
{
14-
public override IList<TItem>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
14+
public override ICollection<TItem>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
1515
SingleOrManySerializationHelper.Deserialize<TItem>(ref reader, options);
1616

17-
public override void Write(Utf8JsonWriter writer, IList<TItem> value, JsonSerializerOptions options) =>
17+
public override void Write(Utf8JsonWriter writer, ICollection<TItem> value, JsonSerializerOptions options) =>
1818
SingleOrManySerializationHelper.Serialize<TItem>(value, writer, options);
1919
}

‎src/Elastic.Clients.Elasticsearch/Serialization/SingleOrManySerializationHelper.cs‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,9 @@ public static IList<TItem> Deserialize<TItem>(ref Utf8JsonReader reader, JsonSer
4343
throw new JsonException("Unexpected token.");
4444
}
4545

46-
public static void Serialize<TItem>(IList<TItem> value, Utf8JsonWriter writer, JsonSerializerOptions options)
46+
public static void Serialize<TItem>(ICollection<TItem> value, Utf8JsonWriter writer, JsonSerializerOptions options)
4747
{
48-
if (value is not ICollection<TItem> collection)
49-
{
50-
// Avoid a double enumeration of counting then iterating.
51-
// Instead, produce an array, even if it's an array of one.
52-
53-
writer.WriteStartArray();
54-
foreach (var item in value)
55-
{
56-
JsonSerializer.Serialize<TItem>(writer, item, options);
57-
}
58-
writer.WriteEndArray();
59-
return;
60-
}
61-
62-
var count = collection.Count;
48+
var count = value.Count;
6349

6450
if (count == 0)
6551
{

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

Lines changed: 46 additions & 46 deletions
Large diffs are not rendered by default.

‎src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterHealthRequest.g.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Elastic.Clients.Elasticsearch.Cluster;
3030
public sealed class ClusterHealthRequestParameters : RequestParameters<ClusterHealthRequestParameters>
3131
{
3232
[JsonIgnore]
33-
public IList<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<IList<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
33+
public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
3434

3535
[JsonIgnore]
3636
public Elastic.Clients.Elasticsearch.Level? Level { get => Q<Elastic.Clients.Elasticsearch.Level?>("level"); set => Q("level", value); }
@@ -77,7 +77,7 @@ public ClusterHealthRequest(Elastic.Clients.Elasticsearch.Indices? indices) : ba
7777
protected override HttpMethod HttpMethod => HttpMethod.GET;
7878
protected override bool SupportsBody => false;
7979
[JsonIgnore]
80-
public IList<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<IList<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
80+
public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
8181

8282
[JsonIgnore]
8383
public Elastic.Clients.Elasticsearch.Level? Level { get => Q<Elastic.Clients.Elasticsearch.Level?>("level"); set => Q("level", value); }
@@ -120,7 +120,7 @@ public ClusterHealthRequestDescriptor()
120120
internal override ApiUrls ApiUrls => ApiUrlsLookups.ClusterHealth;
121121
protected override HttpMethod HttpMethod => HttpMethod.GET;
122122
protected override bool SupportsBody => false;
123-
public ClusterHealthRequestDescriptor<TDocument> ExpandWildcards(IList<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
123+
public ClusterHealthRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
124124
public ClusterHealthRequestDescriptor<TDocument> Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level);
125125
public ClusterHealthRequestDescriptor<TDocument> Local(bool? local = true) => Qs("local", local);
126126
public ClusterHealthRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
@@ -152,7 +152,7 @@ public ClusterHealthRequestDescriptor()
152152
internal override ApiUrls ApiUrls => ApiUrlsLookups.ClusterHealth;
153153
protected override HttpMethod HttpMethod => HttpMethod.GET;
154154
protected override bool SupportsBody => false;
155-
public ClusterHealthRequestDescriptor ExpandWildcards(IList<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
155+
public ClusterHealthRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
156156
public ClusterHealthRequestDescriptor Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level);
157157
public ClusterHealthRequestDescriptor Local(bool? local = true) => Qs("local", local);
158158
public ClusterHealthRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public sealed class CountRequestParameters : RequestParameters<CountRequestParam
4545
public string? Df { get => Q<string?>("df"); set => Q("df", value); }
4646

4747
[JsonIgnore]
48-
public IList<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<IList<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
48+
public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
4949

5050
[JsonIgnore]
5151
public bool? IgnoreThrottled { get => Q<bool?>("ignore_throttled"); set => Q("ignore_throttled", value); }
@@ -101,7 +101,7 @@ public CountRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
101101
public string? Df { get => Q<string?>("df"); set => Q("df", value); }
102102

103103
[JsonIgnore]
104-
public IList<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<IList<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
104+
public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
105105

106106
[JsonIgnore]
107107
public bool? IgnoreThrottled { get => Q<bool?>("ignore_throttled"); set => Q("ignore_throttled", value); }
@@ -151,7 +151,7 @@ public CountRequestDescriptor(Elasticsearch.Indices? indices) : base(r => r.Opti
151151
public CountRequestDescriptor<TDocument> Analyzer(string? analyzer) => Qs("analyzer", analyzer);
152152
public CountRequestDescriptor<TDocument> DefaultOperator(Elastic.Clients.Elasticsearch.QueryDsl.Operator? defaultOperator) => Qs("default_operator", defaultOperator);
153153
public CountRequestDescriptor<TDocument> Df(string? df) => Qs("df", df);
154-
public CountRequestDescriptor<TDocument> ExpandWildcards(IList<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
154+
public CountRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
155155
public CountRequestDescriptor<TDocument> IgnoreThrottled(bool? ignoreThrottled = true) => Qs("ignore_throttled", ignoreThrottled);
156156
public CountRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
157157
public CountRequestDescriptor<TDocument> Lenient(bool? lenient = true) => Qs("lenient", lenient);
@@ -238,7 +238,7 @@ public CountRequestDescriptor()
238238
public CountRequestDescriptor Analyzer(string? analyzer) => Qs("analyzer", analyzer);
239239
public CountRequestDescriptor DefaultOperator(Elastic.Clients.Elasticsearch.QueryDsl.Operator? defaultOperator) => Qs("default_operator", defaultOperator);
240240
public CountRequestDescriptor Df(string? df) => Qs("df", df);
241-
public CountRequestDescriptor ExpandWildcards(IList<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
241+
public CountRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
242242
public CountRequestDescriptor IgnoreThrottled(bool? ignoreThrottled = true) => Qs("ignore_throttled", ignoreThrottled);
243243
public CountRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
244244
public CountRequestDescriptor Lenient(bool? lenient = true) => Qs("lenient", lenient);

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public sealed class DeleteByQueryRequestParameters : RequestParameters<DeleteByQ
4848
public string? Df { get => Q<string?>("df"); set => Q("df", value); }
4949

5050
[JsonIgnore]
51-
public IList<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<IList<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
51+
public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
5252

5353
[JsonIgnore]
5454
public long? From { get => Q<long?>("from"); set => Q("from", value); }
@@ -93,10 +93,10 @@ public sealed class DeleteByQueryRequestParameters : RequestParameters<DeleteByQ
9393
public Elastic.Clients.Elasticsearch.Slices? Slices { get => Q<Elastic.Clients.Elasticsearch.Slices?>("slices"); set => Q("slices", value); }
9494

9595
[JsonIgnore]
96-
public IList<string>? Sort { get => Q<IList<string>?>("sort"); set => Q("sort", value); }
96+
public ICollection<string>? Sort { get => Q<ICollection<string>?>("sort"); set => Q("sort", value); }
9797

9898
[JsonIgnore]
99-
public IList<string>? Stats { get => Q<IList<string>?>("stats"); set => Q("stats", value); }
99+
public ICollection<string>? Stats { get => Q<ICollection<string>?>("stats"); set => Q("stats", value); }
100100

101101
[JsonIgnore]
102102
public long? TerminateAfter { get => Q<long?>("terminate_after"); set => Q("terminate_after", value); }
@@ -142,7 +142,7 @@ public DeleteByQueryRequest(Elastic.Clients.Elasticsearch.Indices indices) : bas
142142
public string? Df { get => Q<string?>("df"); set => Q("df", value); }
143143

144144
[JsonIgnore]
145-
public IList<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<IList<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
145+
public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
146146

147147
[JsonIgnore]
148148
public long? From { get => Q<long?>("from"); set => Q("from", value); }
@@ -187,10 +187,10 @@ public DeleteByQueryRequest(Elastic.Clients.Elasticsearch.Indices indices) : bas
187187
public Elastic.Clients.Elasticsearch.Slices? Slices { get => Q<Elastic.Clients.Elasticsearch.Slices?>("slices"); set => Q("slices", value); }
188188

189189
[JsonIgnore]
190-
public IList<string>? Sort { get => Q<IList<string>?>("sort"); set => Q("sort", value); }
190+
public ICollection<string>? Sort { get => Q<ICollection<string>?>("sort"); set => Q("sort", value); }
191191

192192
[JsonIgnore]
193-
public IList<string>? Stats { get => Q<IList<string>?>("stats"); set => Q("stats", value); }
193+
public ICollection<string>? Stats { get => Q<ICollection<string>?>("stats"); set => Q("stats", value); }
194194

195195
[JsonIgnore]
196196
public long? TerminateAfter { get => Q<long?>("terminate_after"); set => Q("terminate_after", value); }
@@ -240,7 +240,7 @@ internal DeleteByQueryRequestDescriptor()
240240
public DeleteByQueryRequestDescriptor<TDocument> Conflicts(Elastic.Clients.Elasticsearch.Conflicts? conflicts) => Qs("conflicts", conflicts);
241241
public DeleteByQueryRequestDescriptor<TDocument> DefaultOperator(Elastic.Clients.Elasticsearch.QueryDsl.Operator? defaultOperator) => Qs("default_operator", defaultOperator);
242242
public DeleteByQueryRequestDescriptor<TDocument> Df(string? df) => Qs("df", df);
243-
public DeleteByQueryRequestDescriptor<TDocument> ExpandWildcards(IList<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
243+
public DeleteByQueryRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
244244
public DeleteByQueryRequestDescriptor<TDocument> From(long? from) => Qs("from", from);
245245
public DeleteByQueryRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
246246
public DeleteByQueryRequestDescriptor<TDocument> Lenient(bool? lenient = true) => Qs("lenient", lenient);
@@ -255,8 +255,8 @@ internal DeleteByQueryRequestDescriptor()
255255
public DeleteByQueryRequestDescriptor<TDocument> SearchTimeout(Elastic.Clients.Elasticsearch.Duration? searchTimeout) => Qs("search_timeout", searchTimeout);
256256
public DeleteByQueryRequestDescriptor<TDocument> SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType);
257257
public DeleteByQueryRequestDescriptor<TDocument> Slices(Elastic.Clients.Elasticsearch.Slices? slices) => Qs("slices", slices);
258-
public DeleteByQueryRequestDescriptor<TDocument> Sort(IList<string>? sort) => Qs("sort", sort);
259-
public DeleteByQueryRequestDescriptor<TDocument> Stats(IList<string>? stats) => Qs("stats", stats);
258+
public DeleteByQueryRequestDescriptor<TDocument> Sort(ICollection<string>? sort) => Qs("sort", sort);
259+
public DeleteByQueryRequestDescriptor<TDocument> Stats(ICollection<string>? stats) => Qs("stats", stats);
260260
public DeleteByQueryRequestDescriptor<TDocument> TerminateAfter(long? terminateAfter) => Qs("terminate_after", terminateAfter);
261261
public DeleteByQueryRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
262262
public DeleteByQueryRequestDescriptor<TDocument> Version(bool? version = true) => Qs("version", version);
@@ -401,7 +401,7 @@ internal DeleteByQueryRequestDescriptor()
401401
public DeleteByQueryRequestDescriptor Conflicts(Elastic.Clients.Elasticsearch.Conflicts? conflicts) => Qs("conflicts", conflicts);
402402
public DeleteByQueryRequestDescriptor DefaultOperator(Elastic.Clients.Elasticsearch.QueryDsl.Operator? defaultOperator) => Qs("default_operator", defaultOperator);
403403
public DeleteByQueryRequestDescriptor Df(string? df) => Qs("df", df);
404-
public DeleteByQueryRequestDescriptor ExpandWildcards(IList<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
404+
public DeleteByQueryRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
405405
public DeleteByQueryRequestDescriptor From(long? from) => Qs("from", from);
406406
public DeleteByQueryRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
407407
public DeleteByQueryRequestDescriptor Lenient(bool? lenient = true) => Qs("lenient", lenient);
@@ -416,8 +416,8 @@ internal DeleteByQueryRequestDescriptor()
416416
public DeleteByQueryRequestDescriptor SearchTimeout(Elastic.Clients.Elasticsearch.Duration? searchTimeout) => Qs("search_timeout", searchTimeout);
417417
public DeleteByQueryRequestDescriptor SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType);
418418
public DeleteByQueryRequestDescriptor Slices(Elastic.Clients.Elasticsearch.Slices? slices) => Qs("slices", slices);
419-
public DeleteByQueryRequestDescriptor Sort(IList<string>? sort) => Qs("sort", sort);
420-
public DeleteByQueryRequestDescriptor Stats(IList<string>? stats) => Qs("stats", stats);
419+
public DeleteByQueryRequestDescriptor Sort(ICollection<string>? sort) => Qs("sort", sort);
420+
public DeleteByQueryRequestDescriptor Stats(ICollection<string>? stats) => Qs("stats", stats);
421421
public DeleteByQueryRequestDescriptor TerminateAfter(long? terminateAfter) => Qs("terminate_after", terminateAfter);
422422
public DeleteByQueryRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
423423
public DeleteByQueryRequestDescriptor Version(bool? version = true) => Qs("version", version);

0 commit comments

Comments
 (0)