Skip to content

Commit e0311d3

Browse files
committed
revert unwanted changes
1 parent d6d463a commit e0311d3

3 files changed

Lines changed: 23 additions & 25 deletions

File tree

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

Lines changed: 8 additions & 9 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.DataStreamOptions;
25+
import co.elastic.clients.elasticsearch.indices.DataStreamOptionsTemplate;
2626
import co.elastic.clients.elasticsearch.indices.IndexSettings;
2727
import co.elastic.clients.json.JsonData;
2828
import co.elastic.clients.json.JsonpDeserializable;
@@ -39,7 +39,6 @@
3939
import java.lang.Long;
4040
import java.lang.String;
4141
import java.util.Map;
42-
import java.util.Objects;
4342
import java.util.function.Function;
4443
import javax.annotation.Nullable;
4544

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

8685
@Nullable
87-
private final DataStreamOptions dataStreamOptions;
86+
private final DataStreamOptionsTemplate dataStreamOptions;
8887

8988
// ---------------------------------------------------------------------------------------------
9089

@@ -153,7 +152,7 @@ public final DataStreamLifecycleWithRollover lifecycle() {
153152
* API name: {@code data_stream_options}
154153
*/
155154
@Nullable
156-
public final DataStreamOptions dataStreamOptions() {
155+
public final DataStreamOptionsTemplate dataStreamOptions() {
157156
return this.dataStreamOptions;
158157
}
159158

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

259258
@Nullable
260-
private DataStreamOptions dataStreamOptions;
259+
private DataStreamOptionsTemplate dataStreamOptions;
261260

262261
public Builder() {
263262
}
@@ -391,7 +390,7 @@ public final Builder lifecycle(
391390
/**
392391
* API name: {@code data_stream_options}
393392
*/
394-
public final Builder dataStreamOptions(@Nullable DataStreamOptions value) {
393+
public final Builder dataStreamOptions(@Nullable DataStreamOptionsTemplate value) {
395394
this.dataStreamOptions = value;
396395
return this;
397396
}
@@ -400,8 +399,8 @@ public final Builder dataStreamOptions(@Nullable DataStreamOptions value) {
400399
* API name: {@code data_stream_options}
401400
*/
402401
public final Builder dataStreamOptions(
403-
Function<DataStreamOptions.Builder, ObjectBuilder<DataStreamOptions>> fn) {
404-
return this.dataStreamOptions(fn.apply(new DataStreamOptions.Builder()).build());
402+
Function<DataStreamOptionsTemplate.Builder, ObjectBuilder<DataStreamOptionsTemplate>> fn) {
403+
return this.dataStreamOptions(fn.apply(new DataStreamOptionsTemplate.Builder()).build());
405404
}
406405

407406
@Override
@@ -445,7 +444,7 @@ protected static void setupComponentTemplateSummaryDeserializer(
445444
op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
446445
op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(AliasDefinition._DESERIALIZER), "aliases");
447446
op.add(Builder::lifecycle, DataStreamLifecycleWithRollover._DESERIALIZER, "lifecycle");
448-
op.add(Builder::dataStreamOptions, DataStreamOptions._DESERIALIZER, "data_stream_options");
447+
op.add(Builder::dataStreamOptions, DataStreamOptionsTemplate._DESERIALIZER, "data_stream_options");
449448

450449
}
451450

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.put_index_template.IndexTemplateMapping;
25+
import co.elastic.clients.elasticsearch.indices.IndexState;
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 IndexTemplateMapping template;
115+
private final IndexState 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 IndexTemplateMapping template() {
221+
public final IndexState 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 IndexTemplateMapping template;
301+
private IndexState 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(IndexTemplateMapping value) {
431+
public final Builder template(IndexState value) {
432432
this.template = value;
433433
return this;
434434
}
@@ -439,8 +439,8 @@ public final Builder template(IndexTemplateMapping value) {
439439
* <p>
440440
* API name: {@code template}
441441
*/
442-
public final Builder template(Function<IndexTemplateMapping.Builder, ObjectBuilder<IndexTemplateMapping>> fn) {
443-
return this.template(fn.apply(new IndexTemplateMapping.Builder()).build());
442+
public final Builder template(Function<IndexState.Builder, ObjectBuilder<IndexState>> fn) {
443+
return this.template(fn.apply(new IndexState.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, IndexTemplateMapping._DESERIALIZER, "template");
495+
op.add(Builder::template, IndexState._DESERIALIZER, "template");
496496
op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
497497

498498
}

java-client/src/main/java/co/elastic/clients/elasticsearch/indices/IndexTemplateSummary.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import jakarta.json.stream.JsonGenerator;
3434
import java.lang.String;
3535
import java.util.Map;
36-
import java.util.Objects;
3736
import java.util.function.Function;
3837
import javax.annotation.Nullable;
3938

@@ -74,7 +73,7 @@ public class IndexTemplateSummary implements JsonpSerializable {
7473
private final DataStreamLifecycleWithRollover lifecycle;
7574

7675
@Nullable
77-
private final DataStreamOptions dataStreamOptions;
76+
private final DataStreamOptionsTemplate dataStreamOptions;
7877

7978
// ---------------------------------------------------------------------------------------------
8079

@@ -137,7 +136,7 @@ public final DataStreamLifecycleWithRollover lifecycle() {
137136
* API name: {@code data_stream_options}
138137
*/
139138
@Nullable
140-
public final DataStreamOptions dataStreamOptions() {
139+
public final DataStreamOptionsTemplate dataStreamOptions() {
141140
return this.dataStreamOptions;
142141
}
143142

@@ -213,7 +212,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder>
213212
private DataStreamLifecycleWithRollover lifecycle;
214213

215214
@Nullable
216-
private DataStreamOptions dataStreamOptions;
215+
private DataStreamOptionsTemplate dataStreamOptions;
217216

218217
public Builder() {
219218
}
@@ -328,7 +327,7 @@ public final Builder lifecycle(
328327
/**
329328
* API name: {@code data_stream_options}
330329
*/
331-
public final Builder dataStreamOptions(@Nullable DataStreamOptions value) {
330+
public final Builder dataStreamOptions(@Nullable DataStreamOptionsTemplate value) {
332331
this.dataStreamOptions = value;
333332
return this;
334333
}
@@ -337,8 +336,8 @@ public final Builder dataStreamOptions(@Nullable DataStreamOptions value) {
337336
* API name: {@code data_stream_options}
338337
*/
339338
public final Builder dataStreamOptions(
340-
Function<DataStreamOptions.Builder, ObjectBuilder<DataStreamOptions>> fn) {
341-
return this.dataStreamOptions(fn.apply(new DataStreamOptions.Builder()).build());
339+
Function<DataStreamOptionsTemplate.Builder, ObjectBuilder<DataStreamOptionsTemplate>> fn) {
340+
return this.dataStreamOptions(fn.apply(new DataStreamOptionsTemplate.Builder()).build());
342341
}
343342

344343
@Override
@@ -379,7 +378,7 @@ protected static void setupIndexTemplateSummaryDeserializer(ObjectDeserializer<I
379378
op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
380379
op.add(Builder::settings, IndexSettings._DESERIALIZER, "settings");
381380
op.add(Builder::lifecycle, DataStreamLifecycleWithRollover._DESERIALIZER, "lifecycle");
382-
op.add(Builder::dataStreamOptions, DataStreamOptions._DESERIALIZER, "data_stream_options");
381+
op.add(Builder::dataStreamOptions, DataStreamOptionsTemplate._DESERIALIZER, "data_stream_options");
383382

384383
}
385384

0 commit comments

Comments
 (0)