Skip to content

Commit 55029f1

Browse files
committed
Use custom Number type in NumberRangeQuery to support greater input value ranges (e.g. long)
1 parent ab7f719 commit 55029f1

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NumberRangeQuery.g.cs

+16-16
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ public override Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQuery Read(ref
4242
reader.Read();
4343
reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
4444
LocalJsonValue<float?> propBoost = default;
45-
LocalJsonValue<double?> propGt = default;
46-
LocalJsonValue<double?> propGte = default;
47-
LocalJsonValue<double?> propLt = default;
48-
LocalJsonValue<double?> propLte = default;
45+
LocalJsonValue<Elastic.Clients.Elasticsearch.Number?> propGt = default;
46+
LocalJsonValue<Elastic.Clients.Elasticsearch.Number?> propGte = default;
47+
LocalJsonValue<Elastic.Clients.Elasticsearch.Number?> propLt = default;
48+
LocalJsonValue<Elastic.Clients.Elasticsearch.Number?> propLte = default;
4949
LocalJsonValue<string?> propQueryName = default;
5050
LocalJsonValue<Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation?> propRelation = default;
5151
while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
@@ -166,28 +166,28 @@ internal NumberRangeQuery(Elastic.Clients.Elasticsearch.Serialization.JsonConstr
166166
/// Greater than.
167167
/// </para>
168168
/// </summary>
169-
public double? Gt { get; set; }
169+
public Elastic.Clients.Elasticsearch.Number? Gt { get; set; }
170170

171171
/// <summary>
172172
/// <para>
173173
/// Greater than or equal to.
174174
/// </para>
175175
/// </summary>
176-
public double? Gte { get; set; }
176+
public Elastic.Clients.Elasticsearch.Number? Gte { get; set; }
177177

178178
/// <summary>
179179
/// <para>
180180
/// Less than.
181181
/// </para>
182182
/// </summary>
183-
public double? Lt { get; set; }
183+
public Elastic.Clients.Elasticsearch.Number? Lt { get; set; }
184184

185185
/// <summary>
186186
/// <para>
187187
/// Less than or equal to.
188188
/// </para>
189189
/// </summary>
190-
public double? Lte { get; set; }
190+
public Elastic.Clients.Elasticsearch.Number? Lte { get; set; }
191191
public string? QueryName { get; set; }
192192

193193
/// <summary>
@@ -250,7 +250,7 @@ public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor<TDocume
250250
/// Greater than.
251251
/// </para>
252252
/// </summary>
253-
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor<TDocument> Gt(double? value)
253+
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor<TDocument> Gt(Elastic.Clients.Elasticsearch.Number? value)
254254
{
255255
Instance.Gt = value;
256256
return this;
@@ -261,7 +261,7 @@ public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor<TDocume
261261
/// Greater than or equal to.
262262
/// </para>
263263
/// </summary>
264-
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor<TDocument> Gte(double? value)
264+
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor<TDocument> Gte(Elastic.Clients.Elasticsearch.Number? value)
265265
{
266266
Instance.Gte = value;
267267
return this;
@@ -272,7 +272,7 @@ public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor<TDocume
272272
/// Less than.
273273
/// </para>
274274
/// </summary>
275-
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor<TDocument> Lt(double? value)
275+
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor<TDocument> Lt(Elastic.Clients.Elasticsearch.Number? value)
276276
{
277277
Instance.Lt = value;
278278
return this;
@@ -283,7 +283,7 @@ public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor<TDocume
283283
/// Less than or equal to.
284284
/// </para>
285285
/// </summary>
286-
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor<TDocument> Lte(double? value)
286+
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor<TDocument> Lte(Elastic.Clients.Elasticsearch.Number? value)
287287
{
288288
Instance.Lte = value;
289289
return this;
@@ -365,7 +365,7 @@ public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor Field<T
365365
/// Greater than.
366366
/// </para>
367367
/// </summary>
368-
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor Gt(double? value)
368+
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor Gt(Elastic.Clients.Elasticsearch.Number? value)
369369
{
370370
Instance.Gt = value;
371371
return this;
@@ -376,7 +376,7 @@ public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor Gt(doub
376376
/// Greater than or equal to.
377377
/// </para>
378378
/// </summary>
379-
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor Gte(double? value)
379+
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor Gte(Elastic.Clients.Elasticsearch.Number? value)
380380
{
381381
Instance.Gte = value;
382382
return this;
@@ -387,7 +387,7 @@ public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor Gte(dou
387387
/// Less than.
388388
/// </para>
389389
/// </summary>
390-
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor Lt(double? value)
390+
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor Lt(Elastic.Clients.Elasticsearch.Number? value)
391391
{
392392
Instance.Lt = value;
393393
return this;
@@ -398,7 +398,7 @@ public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor Lt(doub
398398
/// Less than or equal to.
399399
/// </para>
400400
/// </summary>
401-
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor Lte(double? value)
401+
public Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQueryDescriptor Lte(Elastic.Clients.Elasticsearch.Number? value)
402402
{
403403
Instance.Lte = value;
404404
return this;

src/Elastic.Clients.Elasticsearch/_Shared/Core/Number/Number.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88

99
using System.Text.Json;
1010
using System.Text.Json.Serialization;
11+
1112
using Elastic.Clients.Elasticsearch.Serialization;
1213

13-
namespace Elastic.Clients.Elasticsearch.Number;
14+
namespace Elastic.Clients.Elasticsearch;
1415

1516
[JsonConverter(typeof(NumberConverter))]
1617
public readonly struct Number
@@ -31,13 +32,14 @@ public Number(double value)
3132
}
3233

3334
public static implicit operator Number(long value) => new(value);
35+
3436
public static implicit operator Number(double value) => new(value);
3537

3638
public bool TryGetLong(out long value)
3739
{
3840
if (_tag is not 1)
3941
{
40-
value = 0l;
42+
value = 0L;
4143
return false;
4244
}
4345

0 commit comments

Comments
 (0)