Skip to content

Commit 11a52ea

Browse files
swallezswallez
committed
[codegen] Use DateTime for dates and timestamps
1 parent 798ba3d commit 11a52ea

File tree

100 files changed

+4120
-954
lines changed

Some content is hidden

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

100 files changed

+4120
-954
lines changed

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/ElasticsearchVersionInfo.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import co.elastic.clients.json.ObjectBuilderDeserializer;
3131
import co.elastic.clients.json.ObjectDeserializer;
3232
import co.elastic.clients.util.ApiTypeHelper;
33+
import co.elastic.clients.util.DateTime;
3334
import co.elastic.clients.util.ObjectBuilder;
3435
import co.elastic.clients.util.ObjectBuilderBase;
3536
import jakarta.json.stream.JsonGenerator;
@@ -48,7 +49,7 @@
4849
*/
4950
@JsonpDeserializable
5051
public class ElasticsearchVersionInfo implements JsonpSerializable {
51-
private final String buildDate;
52+
private final DateTime buildDate;
5253

5354
private final String buildFlavor;
5455

@@ -91,7 +92,7 @@ public static ElasticsearchVersionInfo of(Function<Builder, ObjectBuilder<Elasti
9192
/**
9293
* Required - API name: {@code build_date}
9394
*/
94-
public final String buildDate() {
95+
public final DateTime buildDate() {
9596
return this.buildDate;
9697
}
9798

@@ -163,8 +164,7 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
163164
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
164165

165166
generator.writeKey("build_date");
166-
generator.write(this.buildDate);
167-
167+
this.buildDate.serialize(generator, mapper);
168168
generator.writeKey("build_flavor");
169169
generator.write(this.buildFlavor);
170170

@@ -198,7 +198,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
198198
*/
199199

200200
public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ElasticsearchVersionInfo> {
201-
private String buildDate;
201+
private DateTime buildDate;
202202

203203
private String buildFlavor;
204204

@@ -219,7 +219,7 @@ public static class Builder extends ObjectBuilderBase implements ObjectBuilder<E
219219
/**
220220
* Required - API name: {@code build_date}
221221
*/
222-
public final Builder buildDate(String value) {
222+
public final Builder buildDate(DateTime value) {
223223
this.buildDate = value;
224224
return this;
225225
}
@@ -312,7 +312,7 @@ public ElasticsearchVersionInfo build() {
312312
protected static void setupElasticsearchVersionInfoDeserializer(
313313
ObjectDeserializer<ElasticsearchVersionInfo.Builder> op) {
314314

315-
op.add(Builder::buildDate, JsonpDeserializer.stringDeserializer(), "build_date");
315+
op.add(Builder::buildDate, DateTime._DESERIALIZER, "build_date");
316316
op.add(Builder::buildFlavor, JsonpDeserializer.stringDeserializer(), "build_flavor");
317317
op.add(Builder::buildHash, JsonpDeserializer.stringDeserializer(), "build_hash");
318318
op.add(Builder::buildSnapshot, JsonpDeserializer.booleanDeserializer(), "build_snapshot");

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/FieldSort.java

+32
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,38 @@ public final Builder missing(Function<FieldValue.Builder, ObjectBuilder<FieldVal
256256
return this.missing(fn.apply(new FieldValue.Builder()).build());
257257
}
258258

259+
/**
260+
* API name: {@code missing}
261+
*/
262+
public final Builder missing(String value) {
263+
this.missing = FieldValue.of(value);
264+
return this;
265+
}
266+
267+
/**
268+
* API name: {@code missing}
269+
*/
270+
public final Builder missing(long value) {
271+
this.missing = FieldValue.of(value);
272+
return this;
273+
}
274+
275+
/**
276+
* API name: {@code missing}
277+
*/
278+
public final Builder missing(double value) {
279+
this.missing = FieldValue.of(value);
280+
return this;
281+
}
282+
283+
/**
284+
* API name: {@code missing}
285+
*/
286+
public final Builder missing(boolean value) {
287+
this.missing = FieldValue.of(value);
288+
return this;
289+
}
290+
259291
/**
260292
* API name: {@code mode}
261293
*/

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/AutoDateHistogramAggregate.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
import co.elastic.clients.json.ObjectBuilderDeserializer;
3030
import co.elastic.clients.json.ObjectDeserializer;
3131
import co.elastic.clients.util.ApiTypeHelper;
32+
import co.elastic.clients.util.DateTime;
3233
import co.elastic.clients.util.ObjectBuilder;
3334
import jakarta.json.stream.JsonGenerator;
34-
import java.lang.String;
3535
import java.util.Objects;
3636
import java.util.function.Function;
3737
import javax.annotation.Nullable;
@@ -48,7 +48,7 @@
4848
public class AutoDateHistogramAggregate extends MultiBucketAggregateBase<DateHistogramBucket>
4949
implements
5050
AggregateVariant {
51-
private final String interval;
51+
private final DateTime interval;
5252

5353
// ---------------------------------------------------------------------------------------------
5454

@@ -74,15 +74,15 @@ public Aggregate.Kind _aggregateKind() {
7474
/**
7575
* Required - API name: {@code interval}
7676
*/
77-
public final String interval() {
77+
public final DateTime interval() {
7878
return this.interval;
7979
}
8080

8181
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
8282

8383
super.serializeInternal(generator, mapper);
8484
generator.writeKey("interval");
85-
generator.write(this.interval);
85+
this.interval.serialize(generator, mapper);
8686

8787
}
8888

@@ -95,12 +95,12 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
9595
public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<DateHistogramBucket, Builder>
9696
implements
9797
ObjectBuilder<AutoDateHistogramAggregate> {
98-
private String interval;
98+
private DateTime interval;
9999

100100
/**
101101
* Required - API name: {@code interval}
102102
*/
103-
public final Builder interval(String value) {
103+
public final Builder interval(DateTime value) {
104104
this.interval = value;
105105
return this;
106106
}
@@ -135,7 +135,7 @@ public AutoDateHistogramAggregate build() {
135135
protected static void setupAutoDateHistogramAggregateDeserializer(
136136
ObjectDeserializer<AutoDateHistogramAggregate.Builder> op) {
137137
MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, DateHistogramBucket._DESERIALIZER);
138-
op.add(Builder::interval, JsonpDeserializer.stringDeserializer(), "interval");
138+
op.add(Builder::interval, DateTime._DESERIALIZER, "interval");
139139

140140
}
141141

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/AutoDateHistogramAggregation.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import co.elastic.clients.json.ObjectBuilderDeserializer;
3232
import co.elastic.clients.json.ObjectDeserializer;
3333
import co.elastic.clients.util.ApiTypeHelper;
34+
import co.elastic.clients.util.DateTime;
3435
import co.elastic.clients.util.ObjectBuilder;
3536
import jakarta.json.stream.JsonGenerator;
3637
import java.lang.Integer;
@@ -63,7 +64,7 @@ public class AutoDateHistogramAggregation extends BucketAggregationBase implemen
6364
private final MinimumInterval minimumInterval;
6465

6566
@Nullable
66-
private final String missing;
67+
private final DateTime missing;
6768

6869
@Nullable
6970
private final String offset;
@@ -141,7 +142,7 @@ public final MinimumInterval minimumInterval() {
141142
* API name: {@code missing}
142143
*/
143144
@Nullable
144-
public final String missing() {
145+
public final DateTime missing() {
145146
return this.missing;
146147
}
147148

@@ -200,8 +201,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
200201
}
201202
if (this.missing != null) {
202203
generator.writeKey("missing");
203-
generator.write(this.missing);
204-
204+
this.missing.serialize(generator, mapper);
205205
}
206206
if (this.offset != null) {
207207
generator.writeKey("offset");
@@ -254,7 +254,7 @@ public static class Builder extends BucketAggregationBase.AbstractBuilder<Builde
254254
private MinimumInterval minimumInterval;
255255

256256
@Nullable
257-
private String missing;
257+
private DateTime missing;
258258

259259
@Nullable
260260
private String offset;
@@ -303,7 +303,7 @@ public final Builder minimumInterval(@Nullable MinimumInterval value) {
303303
/**
304304
* API name: {@code missing}
305305
*/
306-
public final Builder missing(@Nullable String value) {
306+
public final Builder missing(@Nullable DateTime value) {
307307
this.missing = value;
308308
return this;
309309
}
@@ -392,7 +392,7 @@ protected static void setupAutoDateHistogramAggregationDeserializer(
392392
op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
393393
op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
394394
op.add(Builder::minimumInterval, MinimumInterval._DESERIALIZER, "minimum_interval");
395-
op.add(Builder::missing, JsonpDeserializer.stringDeserializer(), "missing");
395+
op.add(Builder::missing, DateTime._DESERIALIZER, "missing");
396396
op.add(Builder::offset, JsonpDeserializer.stringDeserializer(), "offset");
397397
op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
398398
op.add(Builder::script, Script._DESERIALIZER, "script");

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/DateHistogramAggregation.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import co.elastic.clients.json.ObjectBuilderDeserializer;
3535
import co.elastic.clients.json.ObjectDeserializer;
3636
import co.elastic.clients.util.ApiTypeHelper;
37+
import co.elastic.clients.util.DateTime;
3738
import co.elastic.clients.util.ObjectBuilder;
3839
import jakarta.json.stream.JsonGenerator;
3940
import java.lang.Boolean;
@@ -79,7 +80,7 @@ public class DateHistogramAggregation extends BucketAggregationBase implements A
7980
private final Integer minDocCount;
8081

8182
@Nullable
82-
private final String missing;
83+
private final DateTime missing;
8384

8485
@Nullable
8586
private final Time offset;
@@ -209,7 +210,7 @@ public final Integer minDocCount() {
209210
* API name: {@code missing}
210211
*/
211212
@Nullable
212-
public final String missing() {
213+
public final DateTime missing() {
213214
return this.missing;
214215
}
215216

@@ -304,8 +305,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
304305
}
305306
if (this.missing != null) {
306307
generator.writeKey("missing");
307-
generator.write(this.missing);
308-
308+
this.missing.serialize(generator, mapper);
309309
}
310310
if (this.offset != null) {
311311
generator.writeKey("offset");
@@ -380,7 +380,7 @@ public static class Builder extends BucketAggregationBase.AbstractBuilder<Builde
380380
private Integer minDocCount;
381381

382382
@Nullable
383-
private String missing;
383+
private DateTime missing;
384384

385385
@Nullable
386386
private Time offset;
@@ -497,7 +497,7 @@ public final Builder minDocCount(@Nullable Integer value) {
497497
/**
498498
* API name: {@code missing}
499499
*/
500-
public final Builder missing(@Nullable String value) {
500+
public final Builder missing(@Nullable DateTime value) {
501501
this.missing = value;
502502
return this;
503503
}
@@ -622,7 +622,7 @@ protected static void setupDateHistogramAggregationDeserializer(
622622
op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
623623
op.add(Builder::interval, Time._DESERIALIZER, "interval");
624624
op.add(Builder::minDocCount, JsonpDeserializer.integerDeserializer(), "min_doc_count");
625-
op.add(Builder::missing, JsonpDeserializer.stringDeserializer(), "missing");
625+
op.add(Builder::missing, DateTime._DESERIALIZER, "missing");
626626
op.add(Builder::offset, Time._DESERIALIZER, "offset");
627627
op.add(Builder::order, HistogramOrder._DESERIALIZER, "order");
628628
op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/DateHistogramBucket.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import co.elastic.clients.json.ObjectBuilderDeserializer;
3030
import co.elastic.clients.json.ObjectDeserializer;
3131
import co.elastic.clients.util.ApiTypeHelper;
32+
import co.elastic.clients.util.DateTime;
3233
import co.elastic.clients.util.ObjectBuilder;
3334
import jakarta.json.stream.JsonGenerator;
3435
import java.lang.String;
@@ -49,7 +50,7 @@ public class DateHistogramBucket extends MultiBucketBase {
4950
@Nullable
5051
private final String keyAsString;
5152

52-
private final String key;
53+
private final DateTime key;
5354

5455
// ---------------------------------------------------------------------------------------------
5556

@@ -76,7 +77,7 @@ public final String keyAsString() {
7677
/**
7778
* Required - API name: {@code key}
7879
*/
79-
public final String key() {
80+
public final DateTime key() {
8081
return this.key;
8182
}
8283

@@ -89,7 +90,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
8990

9091
}
9192
generator.writeKey("key");
92-
generator.write(this.key);
93+
this.key.serialize(generator, mapper);
9394

9495
}
9596

@@ -105,7 +106,7 @@ public static class Builder extends MultiBucketBase.AbstractBuilder<Builder>
105106
@Nullable
106107
private String keyAsString;
107108

108-
private String key;
109+
private DateTime key;
109110

110111
/**
111112
* API name: {@code key_as_string}
@@ -118,7 +119,7 @@ public final Builder keyAsString(@Nullable String value) {
118119
/**
119120
* Required - API name: {@code key}
120121
*/
121-
public final Builder key(String value) {
122+
public final Builder key(DateTime value) {
122123
this.key = value;
123124
return this;
124125
}
@@ -152,7 +153,7 @@ public DateHistogramBucket build() {
152153
protected static void setupDateHistogramBucketDeserializer(ObjectDeserializer<DateHistogramBucket.Builder> op) {
153154
MultiBucketBase.setupMultiBucketBaseDeserializer(op);
154155
op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
155-
op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
156+
op.add(Builder::key, DateTime._DESERIALIZER, "key");
156157

157158
}
158159

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/DateRangeAggregation.java

+32
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,38 @@ public final Builder missing(Function<FieldValue.Builder, ObjectBuilder<FieldVal
238238
return this.missing(fn.apply(new FieldValue.Builder()).build());
239239
}
240240

241+
/**
242+
* API name: {@code missing}
243+
*/
244+
public final Builder missing(String value) {
245+
this.missing = FieldValue.of(value);
246+
return this;
247+
}
248+
249+
/**
250+
* API name: {@code missing}
251+
*/
252+
public final Builder missing(long value) {
253+
this.missing = FieldValue.of(value);
254+
return this;
255+
}
256+
257+
/**
258+
* API name: {@code missing}
259+
*/
260+
public final Builder missing(double value) {
261+
this.missing = FieldValue.of(value);
262+
return this;
263+
}
264+
265+
/**
266+
* API name: {@code missing}
267+
*/
268+
public final Builder missing(boolean value) {
269+
this.missing = FieldValue.of(value);
270+
return this;
271+
}
272+
241273
/**
242274
* API name: {@code ranges}
243275
* <p>

0 commit comments

Comments
 (0)