Skip to content

Commit f3751c6

Browse files
swallezswallez
committed
[codegen] Update to latest API spec
1 parent 4854e7d commit f3751c6

20 files changed

+655
-361
lines changed

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

+1-9
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
* specification</a>
5656
*/
5757
@JsonpDeserializable
58-
public class IcuTokenizer extends TokenizerBase implements TokenizerDefinitionVariant, TokenFilterDefinitionVariant {
58+
public class IcuTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
5959
private final String ruleFiles;
6060

6161
// ---------------------------------------------------------------------------------------------
@@ -79,14 +79,6 @@ public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
7979
return TokenizerDefinition.Kind.IcuTokenizer;
8080
}
8181

82-
/**
83-
* TokenFilterDefinition variant kind.
84-
*/
85-
@Override
86-
public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
87-
return TokenFilterDefinition.Kind.IcuTokenizer;
88-
}
89-
9082
/**
9183
* Required - API name: {@code rule_files}
9284
*/

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

-31
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ public enum Kind implements JsonEnum {
100100

101101
IcuNormalizer("icu_normalizer"),
102102

103-
IcuTokenizer("icu_tokenizer"),
104-
105103
IcuTransform("icu_transform"),
106104

107105
Kstem("kstem"),
@@ -454,23 +452,6 @@ public IcuNormalizationTokenFilter icuNormalizer() {
454452
return TaggedUnionUtils.get(this, Kind.IcuNormalizer);
455453
}
456454

457-
/**
458-
* Is this variant instance of kind {@code icu_tokenizer}?
459-
*/
460-
public boolean isIcuTokenizer() {
461-
return _kind == Kind.IcuTokenizer;
462-
}
463-
464-
/**
465-
* Get the {@code icu_tokenizer} variant value.
466-
*
467-
* @throws IllegalStateException
468-
* if the current variant is not of the {@code icu_tokenizer} kind.
469-
*/
470-
public IcuTokenizer icuTokenizer() {
471-
return TaggedUnionUtils.get(this, Kind.IcuTokenizer);
472-
}
473-
474455
/**
475456
* Is this variant instance of kind {@code icu_transform}?
476457
*/
@@ -1254,17 +1235,6 @@ public ObjectBuilder<TokenFilterDefinition> icuNormalizer(
12541235
return this.icuNormalizer(fn.apply(new IcuNormalizationTokenFilter.Builder()).build());
12551236
}
12561237

1257-
public ObjectBuilder<TokenFilterDefinition> icuTokenizer(IcuTokenizer v) {
1258-
this._kind = Kind.IcuTokenizer;
1259-
this._value = v;
1260-
return this;
1261-
}
1262-
1263-
public ObjectBuilder<TokenFilterDefinition> icuTokenizer(
1264-
Function<IcuTokenizer.Builder, ObjectBuilder<IcuTokenizer>> fn) {
1265-
return this.icuTokenizer(fn.apply(new IcuTokenizer.Builder()).build());
1266-
}
1267-
12681238
public ObjectBuilder<TokenFilterDefinition> icuTransform(IcuTransformTokenFilter v) {
12691239
this._kind = Kind.IcuTransform;
12701240
this._value = v;
@@ -1679,7 +1649,6 @@ protected static void setupTokenFilterDefinitionDeserializer(ObjectDeserializer<
16791649
op.add(Builder::icuCollation, IcuCollationTokenFilter._DESERIALIZER, "icu_collation");
16801650
op.add(Builder::icuFolding, IcuFoldingTokenFilter._DESERIALIZER, "icu_folding");
16811651
op.add(Builder::icuNormalizer, IcuNormalizationTokenFilter._DESERIALIZER, "icu_normalizer");
1682-
op.add(Builder::icuTokenizer, IcuTokenizer._DESERIALIZER, "icu_tokenizer");
16831652
op.add(Builder::icuTransform, IcuTransformTokenFilter._DESERIALIZER, "icu_transform");
16841653
op.add(Builder::kstem, KStemTokenFilter._DESERIALIZER, "kstem");
16851654
op.add(Builder::keepTypes, KeepTypesTokenFilter._DESERIALIZER, "keep_types");

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

-18
Original file line numberDiff line numberDiff line change
@@ -293,24 +293,6 @@ public static TokenFilterDefinition icuNormalizer(
293293
return builder.build();
294294
}
295295

296-
/**
297-
* Creates a builder for the {@link IcuTokenizer icu_tokenizer}
298-
* {@code TokenFilterDefinition} variant.
299-
*/
300-
public static IcuTokenizer.Builder icuTokenizer() {
301-
return new IcuTokenizer.Builder();
302-
}
303-
304-
/**
305-
* Creates a TokenFilterDefinition of the {@link IcuTokenizer icu_tokenizer}
306-
* {@code TokenFilterDefinition} variant.
307-
*/
308-
public static TokenFilterDefinition icuTokenizer(Function<IcuTokenizer.Builder, ObjectBuilder<IcuTokenizer>> fn) {
309-
TokenFilterDefinition.Builder builder = new TokenFilterDefinition.Builder();
310-
builder.icuTokenizer(fn.apply(new IcuTokenizer.Builder()).build());
311-
return builder.build();
312-
}
313-
314296
/**
315297
* Creates a builder for the {@link IcuTransformTokenFilter icu_transform}
316298
* {@code TokenFilterDefinition} variant.

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

+29
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,16 @@ public class ObjectProperty extends CorePropertyBase implements PropertyVariant
5959
@Nullable
6060
private final Boolean enabled;
6161

62+
@Nullable
63+
private final Boolean subobjects;
64+
6265
// ---------------------------------------------------------------------------------------------
6366

6467
private ObjectProperty(Builder builder) {
6568
super(builder);
6669

6770
this.enabled = builder.enabled;
71+
this.subobjects = builder.subobjects;
6872

6973
}
7074

@@ -88,6 +92,14 @@ public final Boolean enabled() {
8892
return this.enabled;
8993
}
9094

95+
/**
96+
* API name: {@code subobjects}
97+
*/
98+
@Nullable
99+
public final Boolean subobjects() {
100+
return this.subobjects;
101+
}
102+
91103
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
92104

93105
generator.write("type", "object");
@@ -97,6 +109,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
97109
generator.write(this.enabled);
98110

99111
}
112+
if (this.subobjects != null) {
113+
generator.writeKey("subobjects");
114+
generator.write(this.subobjects);
115+
116+
}
100117

101118
}
102119

@@ -112,6 +129,9 @@ public static class Builder extends CorePropertyBase.AbstractBuilder<Builder>
112129
@Nullable
113130
private Boolean enabled;
114131

132+
@Nullable
133+
private Boolean subobjects;
134+
115135
/**
116136
* API name: {@code enabled}
117137
*/
@@ -120,6 +140,14 @@ public final Builder enabled(@Nullable Boolean value) {
120140
return this;
121141
}
122142

143+
/**
144+
* API name: {@code subobjects}
145+
*/
146+
public final Builder subobjects(@Nullable Boolean value) {
147+
this.subobjects = value;
148+
return this;
149+
}
150+
123151
@Override
124152
protected Builder self() {
125153
return this;
@@ -149,6 +177,7 @@ public ObjectProperty build() {
149177
protected static void setupObjectPropertyDeserializer(ObjectDeserializer<ObjectProperty.Builder> op) {
150178
CorePropertyBase.setupCorePropertyBaseDeserializer(op);
151179
op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
180+
op.add(Builder::subobjects, JsonpDeserializer.booleanDeserializer(), "subobjects");
152181

153182
op.ignore("type");
154183
}

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

+29
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ public class TypeMapping implements JsonpSerializable {
103103
@Nullable
104104
private final Boolean enabled;
105105

106+
@Nullable
107+
private final Boolean subobjects;
108+
106109
@Nullable
107110
private final DataStreamTimestamp dataStreamTimestamp;
108111

@@ -125,6 +128,7 @@ private TypeMapping(Builder builder) {
125128
this.source = builder.source;
126129
this.runtime = ApiTypeHelper.unmodifiable(builder.runtime);
127130
this.enabled = builder.enabled;
131+
this.subobjects = builder.subobjects;
128132
this.dataStreamTimestamp = builder.dataStreamTimestamp;
129133

130134
}
@@ -248,6 +252,14 @@ public final Boolean enabled() {
248252
return this.enabled;
249253
}
250254

255+
/**
256+
* API name: {@code subobjects}
257+
*/
258+
@Nullable
259+
public final Boolean subobjects() {
260+
return this.subobjects;
261+
}
262+
251263
/**
252264
* API name: {@code _data_stream_timestamp}
253265
*/
@@ -376,6 +388,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
376388
generator.writeKey("enabled");
377389
generator.write(this.enabled);
378390

391+
}
392+
if (this.subobjects != null) {
393+
generator.writeKey("subobjects");
394+
generator.write(this.subobjects);
395+
379396
}
380397
if (this.dataStreamTimestamp != null) {
381398
generator.writeKey("_data_stream_timestamp");
@@ -442,6 +459,9 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder> implement
442459
@Nullable
443460
private Boolean enabled;
444461

462+
@Nullable
463+
private Boolean subobjects;
464+
445465
@Nullable
446466
private DataStreamTimestamp dataStreamTimestamp;
447467

@@ -686,6 +706,14 @@ public final Builder enabled(@Nullable Boolean value) {
686706
return this;
687707
}
688708

709+
/**
710+
* API name: {@code subobjects}
711+
*/
712+
public final Builder subobjects(@Nullable Boolean value) {
713+
this.subobjects = value;
714+
return this;
715+
}
716+
689717
/**
690718
* API name: {@code _data_stream_timestamp}
691719
*/
@@ -747,6 +775,7 @@ protected static void setupTypeMappingDeserializer(ObjectDeserializer<TypeMappin
747775
op.add(Builder::source, SourceField._DESERIALIZER, "_source");
748776
op.add(Builder::runtime, JsonpDeserializer.stringMapDeserializer(RuntimeField._DESERIALIZER), "runtime");
749777
op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
778+
op.add(Builder::subobjects, JsonpDeserializer.booleanDeserializer(), "subobjects");
750779
op.add(Builder::dataStreamTimestamp, DataStreamTimestamp._DESERIALIZER, "_data_stream_timestamp");
751780

752781
}

0 commit comments

Comments
 (0)