Skip to content

Commit 7ecb2e0

Browse files
committed
[codegen] Use DateTime for dates and timestamps
1 parent 51294bb commit 7ecb2e0

File tree

103 files changed

+4120
-1336
lines changed

Some content is hidden

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

103 files changed

+4120
-1336
lines changed

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

-185
This file was deleted.

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

-38
This file was deleted.

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

0 commit comments

Comments
 (0)