Skip to content

Commit 4eb0276

Browse files
l-trottal-trotta
authored
fixes from api-spec pr 2485 (#776)
1 parent 5f277ee commit 4eb0276

File tree

59 files changed

+2076
-1027
lines changed

Some content is hidden

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

59 files changed

+2076
-1027
lines changed

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

+13-8
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ public abstract class WriteResponseBase implements JsonpSerializable {
6565

6666
private final String index;
6767

68-
private final long primaryTerm;
68+
@Nullable
69+
private final Long primaryTerm;
6970

7071
private final Result result;
7172

@@ -84,7 +85,7 @@ protected WriteResponseBase(AbstractBuilder<?> builder) {
8485

8586
this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
8687
this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
87-
this.primaryTerm = ApiTypeHelper.requireNonNull(builder.primaryTerm, this, "primaryTerm");
88+
this.primaryTerm = builder.primaryTerm;
8889
this.result = ApiTypeHelper.requireNonNull(builder.result, this, "result");
8990
this.seqNo = ApiTypeHelper.requireNonNull(builder.seqNo, this, "seqNo");
9091
this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
@@ -108,9 +109,10 @@ public final String index() {
108109
}
109110

110111
/**
111-
* Required - API name: {@code _primary_term}
112+
* API name: {@code _primary_term}
112113
*/
113-
public final long primaryTerm() {
114+
@Nullable
115+
public final Long primaryTerm() {
114116
return this.primaryTerm;
115117
}
116118

@@ -167,9 +169,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
167169
generator.writeKey("_index");
168170
generator.write(this.index);
169171

170-
generator.writeKey("_primary_term");
171-
generator.write(this.primaryTerm);
172+
if (this.primaryTerm != null) {
173+
generator.writeKey("_primary_term");
174+
generator.write(this.primaryTerm);
172175

176+
}
173177
generator.writeKey("result");
174178
this.result.serialize(generator, mapper);
175179
generator.writeKey("_seq_no");
@@ -201,6 +205,7 @@ public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<Bu
201205

202206
private String index;
203207

208+
@Nullable
204209
private Long primaryTerm;
205210

206211
private Result result;
@@ -231,9 +236,9 @@ public final BuilderT index(String value) {
231236
}
232237

233238
/**
234-
* Required - API name: {@code _primary_term}
239+
* API name: {@code _primary_term}
235240
*/
236-
public final BuilderT primaryTerm(long value) {
241+
public final BuilderT primaryTerm(@Nullable Long value) {
237242
this.primaryTerm = value;
238243
return self();
239244
}

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

+18-4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import co.elastic.clients.json.JsonpDeserializable;
2424
import co.elastic.clients.json.JsonpDeserializer;
2525
import co.elastic.clients.json.JsonpMapper;
26+
import co.elastic.clients.json.JsonpSerializable;
27+
import co.elastic.clients.json.JsonpUtils;
2628
import co.elastic.clients.json.ObjectBuilderDeserializer;
2729
import co.elastic.clients.json.ObjectDeserializer;
2830
import co.elastic.clients.util.ApiTypeHelper;
@@ -58,13 +60,12 @@
5860
* specification</a>
5961
*/
6062
@JsonpDeserializable
61-
public class AdjacencyMatrixAggregation extends BucketAggregationBase implements AggregationVariant {
63+
public class AdjacencyMatrixAggregation extends BucketAggregationBase implements AggregationVariant, JsonpSerializable {
6264
private final Map<String, Query> filters;
6365

6466
// ---------------------------------------------------------------------------------------------
6567

6668
private AdjacencyMatrixAggregation(Builder builder) {
67-
super(builder);
6869

6970
this.filters = ApiTypeHelper.unmodifiable(builder.filters);
7071

@@ -91,9 +92,17 @@ public final Map<String, Query> filters() {
9192
return this.filters;
9293
}
9394

95+
/**
96+
* Serialize this object to JSON.
97+
*/
98+
public void serialize(JsonGenerator generator, JsonpMapper mapper) {
99+
generator.writeStartObject();
100+
serializeInternal(generator, mapper);
101+
generator.writeEnd();
102+
}
103+
94104
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
95105

96-
super.serializeInternal(generator, mapper);
97106
if (ApiTypeHelper.isDefined(this.filters)) {
98107
generator.writeKey("filters");
99108
generator.writeStartObject();
@@ -108,6 +117,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
108117

109118
}
110119

120+
@Override
121+
public String toString() {
122+
return JsonpUtils.toString(this);
123+
}
124+
111125
// ---------------------------------------------------------------------------------------------
112126

113127
/**
@@ -183,7 +197,7 @@ public AdjacencyMatrixAggregation build() {
183197

184198
protected static void setupAdjacencyMatrixAggregationDeserializer(
185199
ObjectDeserializer<AdjacencyMatrixAggregation.Builder> op) {
186-
BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
200+
187201
op.add(Builder::filters, JsonpDeserializer.stringMapDeserializer(Query._DESERIALIZER), "filters");
188202

189203
}

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

+2-114
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,14 @@
1919

2020
package co.elastic.clients.elasticsearch._types.aggregations;
2121

22-
import co.elastic.clients.json.JsonData;
2322
import co.elastic.clients.json.JsonpDeserializable;
2423
import co.elastic.clients.json.JsonpDeserializer;
25-
import co.elastic.clients.json.JsonpMapper;
26-
import co.elastic.clients.json.JsonpSerializable;
27-
import co.elastic.clients.json.JsonpUtils;
2824
import co.elastic.clients.json.ObjectBuilderDeserializer;
2925
import co.elastic.clients.json.ObjectDeserializer;
30-
import co.elastic.clients.util.ApiTypeHelper;
3126
import co.elastic.clients.util.ObjectBuilder;
3227
import co.elastic.clients.util.WithJsonObjectBuilderBase;
3328
import jakarta.json.stream.JsonGenerator;
34-
import java.lang.String;
35-
import java.util.Map;
3629
import java.util.Objects;
37-
import javax.annotation.Nullable;
3830

3931
//----------------------------------------------------------------
4032
// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
@@ -60,119 +52,15 @@
6052
* specification</a>
6153
*/
6254

63-
public abstract class AggregationBase implements JsonpSerializable {
64-
private final Map<String, JsonData> meta;
65-
66-
@Nullable
67-
private final String name;
68-
69-
// ---------------------------------------------------------------------------------------------
70-
71-
protected AggregationBase(AbstractBuilder<?> builder) {
72-
73-
this.meta = ApiTypeHelper.unmodifiable(builder.meta);
74-
this.name = builder.name;
75-
76-
}
77-
78-
/**
79-
* API name: {@code meta}
80-
*/
81-
public final Map<String, JsonData> meta() {
82-
return this.meta;
83-
}
84-
85-
/**
86-
* API name: {@code name}
87-
*/
88-
@Nullable
89-
public final String name() {
90-
return this.name;
91-
}
92-
93-
/**
94-
* Serialize this object to JSON.
95-
*/
96-
public void serialize(JsonGenerator generator, JsonpMapper mapper) {
97-
generator.writeStartObject();
98-
serializeInternal(generator, mapper);
99-
generator.writeEnd();
100-
}
101-
102-
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
103-
104-
if (ApiTypeHelper.isDefined(this.meta)) {
105-
generator.writeKey("meta");
106-
generator.writeStartObject();
107-
for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
108-
generator.writeKey(item0.getKey());
109-
item0.getValue().serialize(generator, mapper);
110-
111-
}
112-
generator.writeEnd();
113-
114-
}
115-
if (this.name != null) {
116-
generator.writeKey("name");
117-
generator.write(this.name);
118-
119-
}
120-
121-
}
122-
123-
@Override
124-
public String toString() {
125-
return JsonpUtils.toString(this);
55+
public abstract class AggregationBase {
56+
public AggregationBase() {
12657
}
12758

12859
public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
12960
extends
13061
WithJsonObjectBuilderBase<BuilderT> {
131-
@Nullable
132-
private Map<String, JsonData> meta;
133-
134-
@Nullable
135-
private String name;
136-
137-
/**
138-
* API name: {@code meta}
139-
* <p>
140-
* Adds all entries of <code>map</code> to <code>meta</code>.
141-
*/
142-
public final BuilderT meta(Map<String, JsonData> map) {
143-
this.meta = _mapPutAll(this.meta, map);
144-
return self();
145-
}
146-
147-
/**
148-
* API name: {@code meta}
149-
* <p>
150-
* Adds an entry to <code>meta</code>.
151-
*/
152-
public final BuilderT meta(String key, JsonData value) {
153-
this.meta = _mapPut(this.meta, key, value);
154-
return self();
155-
}
156-
157-
/**
158-
* API name: {@code name}
159-
*/
160-
public final BuilderT name(@Nullable String value) {
161-
this.name = value;
162-
return self();
163-
}
164-
16562
protected abstract BuilderT self();
16663

16764
}
16865

169-
// ---------------------------------------------------------------------------------------------
170-
protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupAggregationBaseDeserializer(
171-
ObjectDeserializer<BuilderT> op) {
172-
173-
op.add(AbstractBuilder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "meta");
174-
op.add(AbstractBuilder::name, JsonpDeserializer.stringDeserializer(), "name");
175-
176-
}
177-
17866
}

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

+21-4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import co.elastic.clients.json.JsonpDeserializable;
2525
import co.elastic.clients.json.JsonpDeserializer;
2626
import co.elastic.clients.json.JsonpMapper;
27+
import co.elastic.clients.json.JsonpSerializable;
28+
import co.elastic.clients.json.JsonpUtils;
2729
import co.elastic.clients.json.ObjectBuilderDeserializer;
2830
import co.elastic.clients.json.ObjectDeserializer;
2931
import co.elastic.clients.util.ApiTypeHelper;
@@ -61,7 +63,10 @@
6163
* specification</a>
6264
*/
6365
@JsonpDeserializable
64-
public class AutoDateHistogramAggregation extends BucketAggregationBase implements AggregationVariant {
66+
public class AutoDateHistogramAggregation extends BucketAggregationBase
67+
implements
68+
AggregationVariant,
69+
JsonpSerializable {
6570
@Nullable
6671
private final Integer buckets;
6772

@@ -91,7 +96,6 @@ public class AutoDateHistogramAggregation extends BucketAggregationBase implemen
9196
// ---------------------------------------------------------------------------------------------
9297

9398
private AutoDateHistogramAggregation(Builder builder) {
94-
super(builder);
9599

96100
this.buckets = builder.buckets;
97101
this.field = builder.field;
@@ -207,9 +211,17 @@ public final String timeZone() {
207211
return this.timeZone;
208212
}
209213

214+
/**
215+
* Serialize this object to JSON.
216+
*/
217+
public void serialize(JsonGenerator generator, JsonpMapper mapper) {
218+
generator.writeStartObject();
219+
serializeInternal(generator, mapper);
220+
generator.writeEnd();
221+
}
222+
210223
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
211224

212-
super.serializeInternal(generator, mapper);
213225
if (this.buckets != null) {
214226
generator.writeKey("buckets");
215227
generator.write(this.buckets);
@@ -262,6 +274,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
262274

263275
}
264276

277+
@Override
278+
public String toString() {
279+
return JsonpUtils.toString(this);
280+
}
281+
265282
// ---------------------------------------------------------------------------------------------
266283

267284
/**
@@ -436,7 +453,7 @@ public AutoDateHistogramAggregation build() {
436453

437454
protected static void setupAutoDateHistogramAggregationDeserializer(
438455
ObjectDeserializer<AutoDateHistogramAggregation.Builder> op) {
439-
BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
456+
440457
op.add(Builder::buckets, JsonpDeserializer.integerDeserializer(), "buckets");
441458
op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
442459
op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");

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

+2-11
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,13 @@
5555
*/
5656

5757
public abstract class BucketAggregationBase extends AggregationBase {
58-
// ---------------------------------------------------------------------------------------------
59-
60-
protected BucketAggregationBase(AbstractBuilder<?> builder) {
61-
super(builder);
62-
58+
public BucketAggregationBase() {
6359
}
6460

6561
public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
6662
extends
6763
AggregationBase.AbstractBuilder<BuilderT> {
68-
}
69-
70-
// ---------------------------------------------------------------------------------------------
71-
protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupBucketAggregationBaseDeserializer(
72-
ObjectDeserializer<BuilderT> op) {
73-
AggregationBase.setupAggregationBaseDeserializer(op);
64+
protected abstract BuilderT self();
7465

7566
}
7667

0 commit comments

Comments
 (0)