Skip to content

Commit 13fedda

Browse files
l-trottal-trotta
committed
[codegen] update to latest spec
1 parent f13590d commit 13fedda

177 files changed

Lines changed: 1278 additions & 677 deletions

File tree

Some content is hidden

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private BucketsPath(Kind kind, Object value) {
9696
public String _toJsonString() {
9797
switch (_kind) {
9898
case Array :
99-
return this.array().stream().map(v -> v).collect(Collectors.joining(","));
99+
return this.array().stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(","));
100100
case Dict :
101101
return this.dict().entrySet().stream().map(e -> e.getKey() + ":" + e.getValue())
102102
.collect(Collectors.joining(","));

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import co.elastic.clients.util.TaggedUnion;
3333
import co.elastic.clients.util.TaggedUnionUtils;
3434
import jakarta.json.stream.JsonGenerator;
35-
import java.lang.Double;
35+
import java.lang.Long;
3636
import java.lang.Object;
3737
import java.lang.String;
3838
import java.util.Objects;
@@ -143,7 +143,7 @@ public boolean isValue() {
143143
* @throws IllegalStateException
144144
* if the current variant is not of the {@code value} kind.
145145
*/
146-
public Double value() {
146+
public Long value() {
147147
return TaggedUnionUtils.get(this, Kind.Value);
148148
}
149149

@@ -158,7 +158,7 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
158158

159159
break;
160160
case Value :
161-
generator.write(((Double) this._value));
161+
generator.write(((Long) this._value));
162162

163163
break;
164164
}
@@ -181,7 +181,7 @@ public ObjectBuilder<FieldDateMath> expr(String v) {
181181
return this;
182182
}
183183

184-
public ObjectBuilder<FieldDateMath> value(Double v) {
184+
public ObjectBuilder<FieldDateMath> value(Long v) {
185185
this._kind = Kind.Value;
186186
this._value = v;
187187
return this;
@@ -197,7 +197,7 @@ public FieldDateMath build() {
197197
private static JsonpDeserializer<FieldDateMath> buildFieldDateMathDeserializer() {
198198
return new UnionDeserializer.Builder<FieldDateMath, Kind, Object>(FieldDateMath::new, false)
199199
.addMember(Kind.Expr, JsonpDeserializer.stringDeserializer())
200-
.addMember(Kind.Value, JsonpDeserializer.doubleDeserializer()).build();
200+
.addMember(Kind.Value, JsonpDeserializer.longDeserializer()).build();
201201
}
202202

203203
public static final JsonpDeserializer<FieldDateMath> _DESERIALIZER = JsonpDeserializer

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private TermsExclude(Kind kind, Object value) {
9292
public String _toJsonString() {
9393
switch (_kind) {
9494
case Terms :
95-
return this.terms().stream().map(v -> v).collect(Collectors.joining(","));
95+
return this.terms().stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(","));
9696
case Regexp :
9797
return this.regexp();
9898

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ public enum FieldType implements JsonEnum {
6161

6262
SearchAsYouType("search_as_you_type"),
6363

64+
Wildcard("wildcard"),
65+
6466
Date("date"),
6567

6668
DateNanos("date_nanos"),

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

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
/*
2+
* Licensed to Elasticsearch B.V. under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch B.V. licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package co.elastic.clients.elasticsearch._types.query_dsl;
21+
22+
import co.elastic.clients.json.JsonpDeserializable;
23+
import co.elastic.clients.json.JsonpDeserializer;
24+
import co.elastic.clients.json.JsonpMapper;
25+
import co.elastic.clients.json.ObjectBuilderDeserializer;
26+
import co.elastic.clients.json.ObjectDeserializer;
27+
import co.elastic.clients.util.ApiTypeHelper;
28+
import co.elastic.clients.util.ObjectBuilder;
29+
import jakarta.json.stream.JsonGenerator;
30+
import java.lang.Long;
31+
import java.lang.String;
32+
import java.util.Objects;
33+
import java.util.function.Function;
34+
import javax.annotation.Nullable;
35+
36+
//----------------------------------------------------------------
37+
// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
38+
//----------------------------------------------------------------
39+
//
40+
// This code is generated from the Elasticsearch API specification
41+
// at https://github.com/elastic/elasticsearch-specification
42+
//
43+
// Manual updates to this file will be lost when the code is
44+
// re-generated.
45+
//
46+
// If you find a property that is missing or wrongly typed, please
47+
// open an issue or a PR on the API specification repository.
48+
//
49+
//----------------------------------------------------------------
50+
51+
// typedef: _types.query_dsl.LongNumberRangeQuery
52+
53+
/**
54+
*
55+
* @see <a href=
56+
* "../../doc-files/api-spec.html#_types.query_dsl.LongNumberRangeQuery">API
57+
* specification</a>
58+
*/
59+
@JsonpDeserializable
60+
public class LongNumberRangeQuery extends RangeQueryBase<Long> implements RangeQueryVariant {
61+
// Single key dictionary
62+
private final String field;
63+
64+
// ---------------------------------------------------------------------------------------------
65+
66+
private LongNumberRangeQuery(Builder builder) {
67+
super(builder);
68+
this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
69+
70+
}
71+
72+
public static LongNumberRangeQuery of(Function<Builder, ObjectBuilder<LongNumberRangeQuery>> fn) {
73+
return fn.apply(new Builder()).build();
74+
}
75+
76+
/**
77+
* RangeQuery variant kind.
78+
*/
79+
@Override
80+
public RangeQuery.Kind _rangeQueryKind() {
81+
return RangeQuery.Kind.LongNumber;
82+
}
83+
84+
/**
85+
* Required - the required field
86+
*/
87+
public final String field() {
88+
return this.field;
89+
}
90+
91+
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
92+
generator.writeStartObject(this.field);
93+
94+
super.serializeInternal(generator, mapper);
95+
96+
generator.writeEnd();
97+
98+
}
99+
100+
// ---------------------------------------------------------------------------------------------
101+
102+
/**
103+
* Builder for {@link LongNumberRangeQuery}.
104+
*/
105+
106+
public static class Builder extends RangeQueryBase.AbstractBuilder<Long, Builder>
107+
implements
108+
ObjectBuilder<LongNumberRangeQuery> {
109+
private String field;
110+
111+
/**
112+
* Required - the required field
113+
*/
114+
public final Builder field(String value) {
115+
this.field = value;
116+
return this;
117+
}
118+
119+
public Builder() {
120+
}
121+
private Builder(LongNumberRangeQuery instance) {
122+
123+
}
124+
@Override
125+
protected Builder self() {
126+
return this;
127+
}
128+
129+
/**
130+
* Builds a {@link LongNumberRangeQuery}.
131+
*
132+
* @throws NullPointerException
133+
* if some of the required fields are null.
134+
*/
135+
public LongNumberRangeQuery build() {
136+
_checkSingleUse();
137+
super.tSerializer(null);
138+
139+
return new LongNumberRangeQuery(this);
140+
}
141+
}
142+
143+
/**
144+
* @return New {@link Builder} initialized with field values of this instance
145+
*/
146+
public Builder rebuild() {
147+
return new Builder(this);
148+
}
149+
// ---------------------------------------------------------------------------------------------
150+
151+
/**
152+
* Json deserializer for {@link LongNumberRangeQuery}
153+
*/
154+
public static final JsonpDeserializer<LongNumberRangeQuery> _DESERIALIZER = ObjectBuilderDeserializer
155+
.lazy(Builder::new, LongNumberRangeQuery::setupLongNumberRangeQueryDeserializer);
156+
157+
protected static void setupLongNumberRangeQueryDeserializer(ObjectDeserializer<LongNumberRangeQuery.Builder> op) {
158+
RangeQueryBase.setupRangeQueryBaseDeserializer(op, JsonpDeserializer.longDeserializer());
159+
160+
op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
161+
162+
}
163+
164+
}

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ public class RangeQuery
8585
public enum Kind implements JsonEnum {
8686
Date("date"),
8787

88+
LongNumber("long_number"),
89+
8890
Number("number"),
8991

9092
Term("term"),
@@ -190,6 +192,23 @@ public DateRangeQuery date() {
190192
return TaggedUnionUtils.get(this, Kind.Date);
191193
}
192194

195+
/**
196+
* Is this variant instance of kind {@code long_number}?
197+
*/
198+
public boolean isLongNumber() {
199+
return _kind == Kind.LongNumber;
200+
}
201+
202+
/**
203+
* Get the {@code long_number} variant value.
204+
*
205+
* @throws IllegalStateException
206+
* if the current variant is not of the {@code long_number} kind.
207+
*/
208+
public LongNumberRangeQuery longNumber() {
209+
return TaggedUnionUtils.get(this, Kind.LongNumber);
210+
}
211+
193212
/**
194213
* Is this variant instance of kind {@code number}?
195214
*/
@@ -267,6 +286,17 @@ public ObjectBuilder<RangeQuery> date(Function<DateRangeQuery.Builder, ObjectBui
267286
return this.date(fn.apply(new DateRangeQuery.Builder()).build());
268287
}
269288

289+
public ObjectBuilder<RangeQuery> longNumber(LongNumberRangeQuery v) {
290+
this._kind = Kind.LongNumber;
291+
this._value = v;
292+
return this;
293+
}
294+
295+
public ObjectBuilder<RangeQuery> longNumber(
296+
Function<LongNumberRangeQuery.Builder, ObjectBuilder<LongNumberRangeQuery>> fn) {
297+
return this.longNumber(fn.apply(new LongNumberRangeQuery.Builder()).build());
298+
}
299+
270300
public ObjectBuilder<RangeQuery> number(NumberRangeQuery v) {
271301
this._kind = Kind.Number;
272302
this._value = v;

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,25 @@ public static RangeQuery date(Function<DateRangeQuery.Builder, ObjectBuilder<Dat
6262
return builder.build();
6363
}
6464

65+
/**
66+
* Creates a builder for the {@link LongNumberRangeQuery long_number}
67+
* {@code RangeQuery} variant.
68+
*/
69+
public static LongNumberRangeQuery.Builder longNumber() {
70+
return new LongNumberRangeQuery.Builder();
71+
}
72+
73+
/**
74+
* Creates a RangeQuery of the {@link LongNumberRangeQuery long_number}
75+
* {@code RangeQuery} variant.
76+
*/
77+
public static RangeQuery longNumber(
78+
Function<LongNumberRangeQuery.Builder, ObjectBuilder<LongNumberRangeQuery>> fn) {
79+
RangeQuery.Builder builder = new RangeQuery.Builder();
80+
builder.longNumber(fn.apply(new LongNumberRangeQuery.Builder()).build());
81+
return builder.build();
82+
}
83+
6584
/**
6685
* Creates a builder for the {@link NumberRangeQuery number} {@code RangeQuery}
6786
* variant.

‎java-client/src/main/java/co/elastic/clients/elasticsearch/async_search/SubmitRequest.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2519,7 +2519,8 @@ protected static void setupSubmitRequestDeserializer(ObjectDeserializer<SubmitRe
25192519
if (propsSet == (_index)) {
25202520
StringBuilder buf = new StringBuilder();
25212521
buf.append("/");
2522-
SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
2522+
SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull)
2523+
.collect(Collectors.joining(",")), buf);
25232524
buf.append("/_async_search");
25242525
return buf.toString();
25252526
}
@@ -2540,7 +2541,8 @@ protected static void setupSubmitRequestDeserializer(ObjectDeserializer<SubmitRe
25402541
if (propsSet == 0) {
25412542
}
25422543
if (propsSet == (_index)) {
2543-
params.put("index", request.index.stream().map(v -> v).collect(Collectors.joining(",")));
2544+
params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull)
2545+
.collect(Collectors.joining(",")));
25442546
}
25452547
return params;
25462548
},
@@ -2580,8 +2582,8 @@ protected static void setupSubmitRequestDeserializer(ObjectDeserializer<SubmitRe
25802582
params.put("allow_partial_search_results", String.valueOf(request.allowPartialSearchResults));
25812583
}
25822584
if (ApiTypeHelper.isDefined(request.expandWildcards)) {
2583-
params.put("expand_wildcards",
2584-
request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
2585+
params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue())
2586+
.filter(Objects::nonNull).collect(Collectors.joining(",")));
25852587
}
25862588
if (request.preference != null) {
25872589
params.put("preference", request.preference);

‎java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AliasesRequest.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,9 @@ public Builder rebuild() {
476476
buf.append("/_cat");
477477
buf.append("/aliases");
478478
buf.append("/");
479-
SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
479+
SimpleEndpoint.pathEncode(
480+
request.name.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")),
481+
buf);
480482
return buf.toString();
481483
}
482484
throw SimpleEndpoint.noPathTemplateFound("path");
@@ -496,7 +498,8 @@ public Builder rebuild() {
496498
if (propsSet == 0) {
497499
}
498500
if (propsSet == (_name)) {
499-
params.put("name", request.name.stream().map(v -> v).collect(Collectors.joining(",")));
501+
params.put("name", request.name.stream().map(v -> v).filter(Objects::nonNull)
502+
.collect(Collectors.joining(",")));
500503
}
501504
return params;
502505
},
@@ -506,17 +509,19 @@ public Builder rebuild() {
506509
Map<String, String> params = new HashMap<>();
507510
params.put("format", "json");
508511
if (ApiTypeHelper.isDefined(request.s)) {
509-
params.put("s", request.s.stream().map(v -> v).collect(Collectors.joining(",")));
512+
params.put("s",
513+
request.s.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
510514
}
511515
if (ApiTypeHelper.isDefined(request.expandWildcards)) {
512-
params.put("expand_wildcards",
513-
request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
516+
params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue())
517+
.filter(Objects::nonNull).collect(Collectors.joining(",")));
514518
}
515519
if (request.bytes != null) {
516520
params.put("bytes", request.bytes.jsonValue());
517521
}
518522
if (ApiTypeHelper.isDefined(request.h)) {
519-
params.put("h", request.h.stream().map(v -> v).collect(Collectors.joining(",")));
523+
params.put("h",
524+
request.h.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
520525
}
521526
if (request.time != null) {
522527
params.put("time", request.time.jsonValue());

0 commit comments

Comments
 (0)