Skip to content

Commit d6d463a

Browse files
l-trottal-trotta
committed
[codegen] update to latest spec
1 parent 253548c commit d6d463a

14 files changed

Lines changed: 450 additions & 420 deletions

File tree

‎java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/ComponentTemplateSummary.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import co.elastic.clients.elasticsearch._types.mapping.TypeMapping;
2323
import co.elastic.clients.elasticsearch.indices.AliasDefinition;
2424
import co.elastic.clients.elasticsearch.indices.DataStreamLifecycleWithRollover;
25-
import co.elastic.clients.elasticsearch.indices.DataStreamOptionsTemplate;
25+
import co.elastic.clients.elasticsearch.indices.DataStreamOptions;
2626
import co.elastic.clients.elasticsearch.indices.IndexSettings;
2727
import co.elastic.clients.json.JsonData;
2828
import co.elastic.clients.json.JsonpDeserializable;
@@ -39,6 +39,7 @@
3939
import java.lang.Long;
4040
import java.lang.String;
4141
import java.util.Map;
42+
import java.util.Objects;
4243
import java.util.function.Function;
4344
import javax.annotation.Nullable;
4445

@@ -83,7 +84,7 @@ public class ComponentTemplateSummary implements JsonpSerializable {
8384
private final DataStreamLifecycleWithRollover lifecycle;
8485

8586
@Nullable
86-
private final DataStreamOptionsTemplate dataStreamOptions;
87+
private final DataStreamOptions dataStreamOptions;
8788

8889
// ---------------------------------------------------------------------------------------------
8990

@@ -152,7 +153,7 @@ public final DataStreamLifecycleWithRollover lifecycle() {
152153
* API name: {@code data_stream_options}
153154
*/
154155
@Nullable
155-
public final DataStreamOptionsTemplate dataStreamOptions() {
156+
public final DataStreamOptions dataStreamOptions() {
156157
return this.dataStreamOptions;
157158
}
158159

@@ -256,7 +257,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder>
256257
private DataStreamLifecycleWithRollover lifecycle;
257258

258259
@Nullable
259-
private DataStreamOptionsTemplate dataStreamOptions;
260+
private DataStreamOptions dataStreamOptions;
260261

261262
public Builder() {
262263
}
@@ -390,7 +391,7 @@ public final Builder lifecycle(
390391
/**
391392
* API name: {@code data_stream_options}
392393
*/
393-
public final Builder dataStreamOptions(@Nullable DataStreamOptionsTemplate value) {
394+
public final Builder dataStreamOptions(@Nullable DataStreamOptions value) {
394395
this.dataStreamOptions = value;
395396
return this;
396397
}
@@ -399,8 +400,8 @@ public final Builder dataStreamOptions(@Nullable DataStreamOptionsTemplate value
399400
* API name: {@code data_stream_options}
400401
*/
401402
public final Builder dataStreamOptions(
402-
Function<DataStreamOptionsTemplate.Builder, ObjectBuilder<DataStreamOptionsTemplate>> fn) {
403-
return this.dataStreamOptions(fn.apply(new DataStreamOptionsTemplate.Builder()).build());
403+
Function<DataStreamOptions.Builder, ObjectBuilder<DataStreamOptions>> fn) {
404+
return this.dataStreamOptions(fn.apply(new DataStreamOptions.Builder()).build());
404405
}
405406

406407
@Override
@@ -444,7 +445,7 @@ protected static void setupComponentTemplateSummaryDeserializer(
444445
op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
445446
op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(AliasDefinition._DESERIALIZER), "aliases");
446447
op.add(Builder::lifecycle, DataStreamLifecycleWithRollover._DESERIALIZER, "lifecycle");
447-
op.add(Builder::dataStreamOptions, DataStreamOptionsTemplate._DESERIALIZER, "data_stream_options");
448+
op.add(Builder::dataStreamOptions, DataStreamOptions._DESERIALIZER, "data_stream_options");
448449

449450
}
450451

‎java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/PutComponentTemplateRequest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import co.elastic.clients.elasticsearch._types.ErrorResponse;
2323
import co.elastic.clients.elasticsearch._types.RequestBase;
2424
import co.elastic.clients.elasticsearch._types.Time;
25-
import co.elastic.clients.elasticsearch.indices.IndexState;
25+
import co.elastic.clients.elasticsearch.indices.put_index_template.IndexTemplateMapping;
2626
import co.elastic.clients.json.JsonData;
2727
import co.elastic.clients.json.JsonpDeserializable;
2828
import co.elastic.clients.json.JsonpDeserializer;
@@ -112,7 +112,7 @@ public class PutComponentTemplateRequest extends RequestBase implements JsonpSer
112112

113113
private final String name;
114114

115-
private final IndexState template;
115+
private final IndexTemplateMapping template;
116116

117117
@Nullable
118118
private final Long version;
@@ -218,7 +218,7 @@ public final String name() {
218218
* <p>
219219
* API name: {@code template}
220220
*/
221-
public final IndexState template() {
221+
public final IndexTemplateMapping template() {
222222
return this.template;
223223
}
224224

@@ -298,7 +298,7 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder>
298298

299299
private String name;
300300

301-
private IndexState template;
301+
private IndexTemplateMapping template;
302302

303303
@Nullable
304304
private Long version;
@@ -428,7 +428,7 @@ public final Builder name(String value) {
428428
* <p>
429429
* API name: {@code template}
430430
*/
431-
public final Builder template(IndexState value) {
431+
public final Builder template(IndexTemplateMapping value) {
432432
this.template = value;
433433
return this;
434434
}
@@ -439,8 +439,8 @@ public final Builder template(IndexState value) {
439439
* <p>
440440
* API name: {@code template}
441441
*/
442-
public final Builder template(Function<IndexState.Builder, ObjectBuilder<IndexState>> fn) {
443-
return this.template(fn.apply(new IndexState.Builder()).build());
442+
public final Builder template(Function<IndexTemplateMapping.Builder, ObjectBuilder<IndexTemplateMapping>> fn) {
443+
return this.template(fn.apply(new IndexTemplateMapping.Builder()).build());
444444
}
445445

446446
/**
@@ -492,7 +492,7 @@ protected static void setupPutComponentTemplateRequestDeserializer(
492492

493493
op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
494494
op.add(Builder::deprecated, JsonpDeserializer.booleanDeserializer(), "deprecated");
495-
op.add(Builder::template, IndexState._DESERIALIZER, "template");
495+
op.add(Builder::template, IndexTemplateMapping._DESERIALIZER, "template");
496496
op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
497497

498498
}

‎java-client/src/main/java/co/elastic/clients/elasticsearch/core/reindex/Source.java‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import co.elastic.clients.elasticsearch._types.mapping.RuntimeField;
2525
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
2626
import co.elastic.clients.elasticsearch._types.query_dsl.QueryVariant;
27+
import co.elastic.clients.elasticsearch.core.search.SourceConfig;
2728
import co.elastic.clients.json.JsonpDeserializable;
2829
import co.elastic.clients.json.JsonpDeserializer;
2930
import co.elastic.clients.json.JsonpMapper;
@@ -83,7 +84,8 @@ public class Source implements JsonpSerializable {
8384

8485
private final List<SortOptions> sort;
8586

86-
private final List<String> sourceFields;
87+
@Nullable
88+
private final SourceConfig sourceFields;
8789

8890
private final Map<String, RuntimeField> runtimeMappings;
8991

@@ -97,7 +99,7 @@ private Source(Builder builder) {
9799
this.size = builder.size;
98100
this.slice = builder.slice;
99101
this.sort = ApiTypeHelper.unmodifiable(builder.sort);
100-
this.sourceFields = ApiTypeHelper.unmodifiable(builder.sourceFields);
102+
this.sourceFields = builder.sourceFields;
101103
this.runtimeMappings = ApiTypeHelper.unmodifiable(builder.runtimeMappings);
102104

103105
}
@@ -185,7 +187,8 @@ public final List<SortOptions> sort() {
185187
* <p>
186188
* API name: {@code _source}
187189
*/
188-
public final List<String> sourceFields() {
190+
@Nullable
191+
public final SourceConfig sourceFields() {
189192
return this.sourceFields;
190193
}
191194

@@ -247,14 +250,9 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
247250
generator.writeEnd();
248251

249252
}
250-
if (ApiTypeHelper.isDefined(this.sourceFields)) {
253+
if (this.sourceFields != null) {
251254
generator.writeKey("_source");
252-
generator.writeStartArray();
253-
for (String item0 : this.sourceFields) {
254-
generator.write(item0);
255-
256-
}
257-
generator.writeEnd();
255+
this.sourceFields.serialize(generator, mapper);
258256

259257
}
260258
if (ApiTypeHelper.isDefined(this.runtimeMappings)) {
@@ -301,7 +299,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder> implement
301299
private List<SortOptions> sort;
302300

303301
@Nullable
304-
private List<String> sourceFields;
302+
private SourceConfig sourceFields;
305303

306304
@Nullable
307305
private Map<String, RuntimeField> runtimeMappings;
@@ -499,11 +497,9 @@ public final Builder sort(Function<SortOptions.Builder, ObjectBuilder<SortOption
499497
* select fields.
500498
* <p>
501499
* API name: {@code _source}
502-
* <p>
503-
* Adds all elements of <code>list</code> to <code>sourceFields</code>.
504500
*/
505-
public final Builder sourceFields(List<String> list) {
506-
this.sourceFields = _listAddAll(this.sourceFields, list);
501+
public final Builder sourceFields(@Nullable SourceConfig value) {
502+
this.sourceFields = value;
507503
return this;
508504
}
509505

@@ -512,12 +508,9 @@ public final Builder sourceFields(List<String> list) {
512508
* select fields.
513509
* <p>
514510
* API name: {@code _source}
515-
* <p>
516-
* Adds one or more values to <code>sourceFields</code>.
517511
*/
518-
public final Builder sourceFields(String value, String... values) {
519-
this.sourceFields = _listAdd(this.sourceFields, value, values);
520-
return this;
512+
public final Builder sourceFields(Function<SourceConfig.Builder, ObjectBuilder<SourceConfig>> fn) {
513+
return this.sourceFields(fn.apply(new SourceConfig.Builder()).build());
521514
}
522515

523516
/**
@@ -590,8 +583,7 @@ protected static void setupSourceDeserializer(ObjectDeserializer<Source.Builder>
590583
op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
591584
op.add(Builder::slice, SlicedScroll._DESERIALIZER, "slice");
592585
op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER), "sort");
593-
op.add(Builder::sourceFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
594-
"_source");
586+
op.add(Builder::sourceFields, SourceConfig._DESERIALIZER, "_source");
595587
op.add(Builder::runtimeMappings, JsonpDeserializer.stringMapDeserializer(RuntimeField._DESERIALIZER),
596588
"runtime_mappings");
597589

‎java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/PhraseSuggester.java‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ public class PhraseSuggester extends SuggesterBase implements FieldSuggesterVari
9393
@Nullable
9494
private final SmoothingModel smoothing;
9595

96-
@Nullable
97-
private final String text;
98-
9996
@Nullable
10097
private final Integer tokenLimit;
10198

@@ -115,7 +112,6 @@ private PhraseSuggester(Builder builder) {
115112
this.separator = builder.separator;
116113
this.shardSize = builder.shardSize;
117114
this.smoothing = builder.smoothing;
118-
this.text = builder.text;
119115
this.tokenLimit = builder.tokenLimit;
120116

121117
}
@@ -255,16 +251,6 @@ public final SmoothingModel smoothing() {
255251
return this.smoothing;
256252
}
257253

258-
/**
259-
* The text/query to provide suggestions for.
260-
* <p>
261-
* API name: {@code text}
262-
*/
263-
@Nullable
264-
public final String text() {
265-
return this.text;
266-
}
267-
268254
/**
269255
* API name: {@code token_limit}
270256
*/
@@ -335,11 +321,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
335321
generator.writeKey("smoothing");
336322
this.smoothing.serialize(generator, mapper);
337323

338-
}
339-
if (this.text != null) {
340-
generator.writeKey("text");
341-
generator.write(this.text);
342-
343324
}
344325
if (this.tokenLimit != null) {
345326
generator.writeKey("token_limit");
@@ -391,9 +372,6 @@ public static class Builder extends SuggesterBase.AbstractBuilder<Builder>
391372
@Nullable
392373
private SmoothingModel smoothing;
393374

394-
@Nullable
395-
private String text;
396-
397375
@Nullable
398376
private Integer tokenLimit;
399377

@@ -411,7 +389,6 @@ private Builder(PhraseSuggester instance) {
411389
this.separator = instance.separator;
412390
this.shardSize = instance.shardSize;
413391
this.smoothing = instance.smoothing;
414-
this.text = instance.text;
415392
this.tokenLimit = instance.tokenLimit;
416393

417394
}
@@ -610,16 +587,6 @@ public final Builder smoothing(SmoothingModelVariant value) {
610587
return this;
611588
}
612589

613-
/**
614-
* The text/query to provide suggestions for.
615-
* <p>
616-
* API name: {@code text}
617-
*/
618-
public final Builder text(@Nullable String value) {
619-
this.text = value;
620-
return this;
621-
}
622-
623590
/**
624591
* API name: {@code token_limit}
625592
*/
@@ -674,7 +641,6 @@ protected static void setupPhraseSuggesterDeserializer(ObjectDeserializer<Phrase
674641
op.add(Builder::separator, JsonpDeserializer.stringDeserializer(), "separator");
675642
op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
676643
op.add(Builder::smoothing, SmoothingModel._DESERIALIZER, "smoothing");
677-
op.add(Builder::text, JsonpDeserializer.stringDeserializer(), "text");
678644
op.add(Builder::tokenLimit, JsonpDeserializer.integerDeserializer(), "token_limit");
679645

680646
}

0 commit comments

Comments
 (0)