> fn) {
/**
* API name: {@code order}
+ *
+ * Adds all elements of list to order.
*/
- public final Builder order(@Nullable HistogramOrder value) {
- this.order = value;
+ public final Builder order(List> list) {
+ this.order = _listAddAll(this.order, list);
return this;
}
/**
* API name: {@code order}
+ *
+ * Adds one or more values to order.
*/
- public final Builder order(Function> fn) {
- return this.order(fn.apply(new HistogramOrder.Builder()).build());
+ public final Builder order(NamedValue value, NamedValue... values) {
+ this.order = _listAdd(this.order, value, values);
+ return this;
}
/**
@@ -624,7 +638,8 @@ protected static void setupDateHistogramAggregationDeserializer(
op.add(Builder::minDocCount, JsonpDeserializer.integerDeserializer(), "min_doc_count");
op.add(Builder::missing, JsonpDeserializer.stringDeserializer(), "missing");
op.add(Builder::offset, Time._DESERIALIZER, "offset");
- op.add(Builder::order, HistogramOrder._DESERIALIZER, "order");
+ op.add(Builder::order,
+ JsonpDeserializer.arrayDeserializer(NamedValue.deserializer(() -> SortOrder._DESERIALIZER)), "order");
op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
op.add(Builder::script, Script._DESERIALIZER, "script");
op.add(Builder::timeZone, JsonpDeserializer.stringDeserializer(), "time_zone");
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/HistogramAggregation.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/HistogramAggregation.java
index 4ea4c5dff..959cf5604 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/HistogramAggregation.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/HistogramAggregation.java
@@ -24,6 +24,7 @@
package co.elastic.clients.elasticsearch._types.aggregations;
import co.elastic.clients.elasticsearch._types.Script;
+import co.elastic.clients.elasticsearch._types.SortOrder;
import co.elastic.clients.elasticsearch.transform.PivotGroupBy;
import co.elastic.clients.elasticsearch.transform.PivotGroupByVariant;
import co.elastic.clients.json.JsonpDeserializable;
@@ -31,12 +32,15 @@
import co.elastic.clients.json.JsonpMapper;
import co.elastic.clients.json.ObjectBuilderDeserializer;
import co.elastic.clients.json.ObjectDeserializer;
+import co.elastic.clients.util.ApiTypeHelper;
+import co.elastic.clients.util.NamedValue;
import co.elastic.clients.util.ObjectBuilder;
import jakarta.json.stream.JsonGenerator;
import java.lang.Boolean;
import java.lang.Double;
import java.lang.Integer;
import java.lang.String;
+import java.util.List;
import java.util.Objects;
import java.util.function.Function;
import javax.annotation.Nullable;
@@ -72,8 +76,7 @@ public class HistogramAggregation extends BucketAggregationBase implements Aggre
@Nullable
private final Double offset;
- @Nullable
- private final HistogramOrder order;
+ private final List> order;
@Nullable
private final Script script;
@@ -96,7 +99,7 @@ private HistogramAggregation(Builder builder) {
this.minDocCount = builder.minDocCount;
this.missing = builder.missing;
this.offset = builder.offset;
- this.order = builder.order;
+ this.order = ApiTypeHelper.unmodifiable(builder.order);
this.script = builder.script;
this.format = builder.format;
this.keyed = builder.keyed;
@@ -182,8 +185,7 @@ public final Double offset() {
/**
* API name: {@code order}
*/
- @Nullable
- public final HistogramOrder order() {
+ public final List> order() {
return this.order;
}
@@ -249,9 +251,17 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
generator.write(this.offset);
}
- if (this.order != null) {
+ if (ApiTypeHelper.isDefined(this.order)) {
generator.writeKey("order");
- this.order.serialize(generator, mapper);
+ generator.writeStartArray();
+ for (NamedValue item0 : this.order) {
+ generator.writeStartObject();
+ generator.writeKey(item0.name());
+ item0.value().serialize(generator, mapper);
+ generator.writeEnd();
+
+ }
+ generator.writeEnd();
}
if (this.script != null) {
@@ -303,7 +313,7 @@ public static class Builder extends BucketAggregationBase.AbstractBuilder> order;
@Nullable
private Script script;
@@ -388,17 +398,22 @@ public final Builder offset(@Nullable Double value) {
/**
* API name: {@code order}
+ *
+ * Adds all elements of list to order.
*/
- public final Builder order(@Nullable HistogramOrder value) {
- this.order = value;
+ public final Builder order(List> list) {
+ this.order = _listAddAll(this.order, list);
return this;
}
/**
* API name: {@code order}
+ *
+ * Adds one or more values to order.
*/
- public final Builder order(Function> fn) {
- return this.order(fn.apply(new HistogramOrder.Builder()).build());
+ public final Builder order(NamedValue value, NamedValue... values) {
+ this.order = _listAdd(this.order, value, values);
+ return this;
}
/**
@@ -470,7 +485,8 @@ protected static void setupHistogramAggregationDeserializer(ObjectDeserializer SortOrder._DESERIALIZER)), "order");
op.add(Builder::script, Script._DESERIALIZER, "script");
op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/MultiTermsAggregation.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/MultiTermsAggregation.java
index 2d8803d78..d2c10f31f 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/MultiTermsAggregation.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/MultiTermsAggregation.java
@@ -23,14 +23,19 @@
package co.elastic.clients.elasticsearch._types.aggregations;
+import co.elastic.clients.elasticsearch._types.SortOrder;
import co.elastic.clients.json.JsonpDeserializable;
import co.elastic.clients.json.JsonpDeserializer;
import co.elastic.clients.json.JsonpMapper;
import co.elastic.clients.json.ObjectBuilderDeserializer;
import co.elastic.clients.json.ObjectDeserializer;
import co.elastic.clients.util.ApiTypeHelper;
+import co.elastic.clients.util.NamedValue;
import co.elastic.clients.util.ObjectBuilder;
import jakarta.json.stream.JsonGenerator;
+import java.lang.Boolean;
+import java.lang.Integer;
+import java.lang.Long;
import java.util.List;
import java.util.Objects;
import java.util.function.Function;
@@ -46,6 +51,26 @@
*/
@JsonpDeserializable
public class MultiTermsAggregation extends BucketAggregationBase implements AggregationVariant {
+ @Nullable
+ private final TermsAggregationCollectMode collectMode;
+
+ private final List> order;
+
+ @Nullable
+ private final Long minDocCount;
+
+ @Nullable
+ private final Long shardMinDocCount;
+
+ @Nullable
+ private final Integer shardSize;
+
+ @Nullable
+ private final Boolean showTermDocCountError;
+
+ @Nullable
+ private final Integer size;
+
private final List terms;
// ---------------------------------------------------------------------------------------------
@@ -53,6 +78,13 @@ public class MultiTermsAggregation extends BucketAggregationBase implements Aggr
private MultiTermsAggregation(Builder builder) {
super(builder);
+ this.collectMode = builder.collectMode;
+ this.order = ApiTypeHelper.unmodifiable(builder.order);
+ this.minDocCount = builder.minDocCount;
+ this.shardMinDocCount = builder.shardMinDocCount;
+ this.shardSize = builder.shardSize;
+ this.showTermDocCountError = builder.showTermDocCountError;
+ this.size = builder.size;
this.terms = ApiTypeHelper.unmodifiableRequired(builder.terms, this, "terms");
}
@@ -69,6 +101,61 @@ public Aggregation.Kind _aggregationKind() {
return Aggregation.Kind.MultiTerms;
}
+ /**
+ * API name: {@code collect_mode}
+ */
+ @Nullable
+ public final TermsAggregationCollectMode collectMode() {
+ return this.collectMode;
+ }
+
+ /**
+ * API name: {@code order}
+ */
+ public final List> order() {
+ return this.order;
+ }
+
+ /**
+ * API name: {@code min_doc_count}
+ */
+ @Nullable
+ public final Long minDocCount() {
+ return this.minDocCount;
+ }
+
+ /**
+ * API name: {@code shard_min_doc_count}
+ */
+ @Nullable
+ public final Long shardMinDocCount() {
+ return this.shardMinDocCount;
+ }
+
+ /**
+ * API name: {@code shard_size}
+ */
+ @Nullable
+ public final Integer shardSize() {
+ return this.shardSize;
+ }
+
+ /**
+ * API name: {@code show_term_doc_count_error}
+ */
+ @Nullable
+ public final Boolean showTermDocCountError() {
+ return this.showTermDocCountError;
+ }
+
+ /**
+ * API name: {@code size}
+ */
+ @Nullable
+ public final Integer size() {
+ return this.size;
+ }
+
/**
* Required - API name: {@code terms}
*/
@@ -79,6 +166,48 @@ public final List terms() {
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
super.serializeInternal(generator, mapper);
+ if (this.collectMode != null) {
+ generator.writeKey("collect_mode");
+ this.collectMode.serialize(generator, mapper);
+ }
+ if (ApiTypeHelper.isDefined(this.order)) {
+ generator.writeKey("order");
+ generator.writeStartArray();
+ for (NamedValue item0 : this.order) {
+ generator.writeStartObject();
+ generator.writeKey(item0.name());
+ item0.value().serialize(generator, mapper);
+ generator.writeEnd();
+
+ }
+ generator.writeEnd();
+
+ }
+ if (this.minDocCount != null) {
+ generator.writeKey("min_doc_count");
+ generator.write(this.minDocCount);
+
+ }
+ if (this.shardMinDocCount != null) {
+ generator.writeKey("shard_min_doc_count");
+ generator.write(this.shardMinDocCount);
+
+ }
+ if (this.shardSize != null) {
+ generator.writeKey("shard_size");
+ generator.write(this.shardSize);
+
+ }
+ if (this.showTermDocCountError != null) {
+ generator.writeKey("show_term_doc_count_error");
+ generator.write(this.showTermDocCountError);
+
+ }
+ if (this.size != null) {
+ generator.writeKey("size");
+ generator.write(this.size);
+
+ }
if (ApiTypeHelper.isDefined(this.terms)) {
generator.writeKey("terms");
generator.writeStartArray();
@@ -101,8 +230,97 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
public static class Builder extends BucketAggregationBase.AbstractBuilder
implements
ObjectBuilder {
+ @Nullable
+ private TermsAggregationCollectMode collectMode;
+
+ @Nullable
+ private List> order;
+
+ @Nullable
+ private Long minDocCount;
+
+ @Nullable
+ private Long shardMinDocCount;
+
+ @Nullable
+ private Integer shardSize;
+
+ @Nullable
+ private Boolean showTermDocCountError;
+
+ @Nullable
+ private Integer size;
+
private List terms;
+ /**
+ * API name: {@code collect_mode}
+ */
+ public final Builder collectMode(@Nullable TermsAggregationCollectMode value) {
+ this.collectMode = value;
+ return this;
+ }
+
+ /**
+ * API name: {@code order}
+ *
+ * Adds all elements of list to order.
+ */
+ public final Builder order(List> list) {
+ this.order = _listAddAll(this.order, list);
+ return this;
+ }
+
+ /**
+ * API name: {@code order}
+ *
+ * Adds one or more values to order.
+ */
+ public final Builder order(NamedValue value, NamedValue... values) {
+ this.order = _listAdd(this.order, value, values);
+ return this;
+ }
+
+ /**
+ * API name: {@code min_doc_count}
+ */
+ public final Builder minDocCount(@Nullable Long value) {
+ this.minDocCount = value;
+ return this;
+ }
+
+ /**
+ * API name: {@code shard_min_doc_count}
+ */
+ public final Builder shardMinDocCount(@Nullable Long value) {
+ this.shardMinDocCount = value;
+ return this;
+ }
+
+ /**
+ * API name: {@code shard_size}
+ */
+ public final Builder shardSize(@Nullable Integer value) {
+ this.shardSize = value;
+ return this;
+ }
+
+ /**
+ * API name: {@code show_term_doc_count_error}
+ */
+ public final Builder showTermDocCountError(@Nullable Boolean value) {
+ this.showTermDocCountError = value;
+ return this;
+ }
+
+ /**
+ * API name: {@code size}
+ */
+ public final Builder size(@Nullable Integer value) {
+ this.size = value;
+ return this;
+ }
+
/**
* Required - API name: {@code terms}
*
@@ -160,6 +378,14 @@ public MultiTermsAggregation build() {
protected static void setupMultiTermsAggregationDeserializer(ObjectDeserializer op) {
BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
+ op.add(Builder::collectMode, TermsAggregationCollectMode._DESERIALIZER, "collect_mode");
+ op.add(Builder::order,
+ JsonpDeserializer.arrayDeserializer(NamedValue.deserializer(() -> SortOrder._DESERIALIZER)), "order");
+ op.add(Builder::minDocCount, JsonpDeserializer.longDeserializer(), "min_doc_count");
+ op.add(Builder::shardMinDocCount, JsonpDeserializer.longDeserializer(), "shard_min_doc_count");
+ op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
+ op.add(Builder::showTermDocCountError, JsonpDeserializer.booleanDeserializer(), "show_term_doc_count_error");
+ op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
op.add(Builder::terms, JsonpDeserializer.arrayDeserializer(MultiTermLookup._DESERIALIZER), "terms");
}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsAggregation.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsAggregation.java
index b6b2e82e9..fe795cf40 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsAggregation.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsAggregation.java
@@ -34,13 +34,13 @@
import co.elastic.clients.json.ObjectBuilderDeserializer;
import co.elastic.clients.json.ObjectDeserializer;
import co.elastic.clients.util.ApiTypeHelper;
+import co.elastic.clients.util.NamedValue;
import co.elastic.clients.util.ObjectBuilder;
import jakarta.json.stream.JsonGenerator;
import java.lang.Boolean;
import java.lang.Integer;
import java.lang.String;
import java.util.List;
-import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
import javax.annotation.Nullable;
@@ -85,7 +85,7 @@ public class TermsAggregation extends BucketAggregationBase implements Aggregati
@Nullable
private final String valueType;
- private final List> order;
+ private final List> order;
@Nullable
private final Script script;
@@ -225,7 +225,7 @@ public final String valueType() {
/**
* API name: {@code order}
*/
- public final List> order() {
+ public final List> order() {
return this.order;
}
@@ -314,14 +314,10 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
if (ApiTypeHelper.isDefined(this.order)) {
generator.writeKey("order");
generator.writeStartArray();
- for (Map item0 : this.order) {
+ for (NamedValue item0 : this.order) {
generator.writeStartObject();
- if (item0 != null) {
- for (Map.Entry item1 : item0.entrySet()) {
- generator.writeKey(item1.getKey());
- item1.getValue().serialize(generator, mapper);
- }
- }
+ generator.writeKey(item0.name());
+ item0.value().serialize(generator, mapper);
generator.writeEnd();
}
@@ -391,7 +387,7 @@ public static class Builder extends BucketAggregationBase.AbstractBuilder> order;
+ private List> order;
@Nullable
private Script script;
@@ -543,7 +539,7 @@ public final Builder valueType(@Nullable String value) {
*
* Adds all elements of list to order.
*/
- public final Builder order(List> list) {
+ public final Builder order(List> list) {
this.order = _listAddAll(this.order, list);
return this;
}
@@ -553,7 +549,7 @@ public final Builder order(List> list) {
*
* Adds one or more values to order.
*/
- public final Builder order(Map value, Map... values) {
+ public final Builder order(NamedValue value, NamedValue... values) {
this.order = _listAdd(this.order, value, values);
return this;
}
@@ -636,8 +632,7 @@ protected static void setupTermsAggregationDeserializer(ObjectDeserializer SortOrder._DESERIALIZER)), "order");
op.add(Builder::script, Script._DESERIALIZER, "script");
op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
op.add(Builder::showTermDocCountError, JsonpDeserializer.booleanDeserializer(), "show_term_doc_count_error");
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/AsciiFoldingTokenFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/AsciiFoldingTokenFilter.java
index 56876efba..c5ee53be2 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/AsciiFoldingTokenFilter.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/AsciiFoldingTokenFilter.java
@@ -28,12 +28,12 @@
import co.elastic.clients.json.JsonpMapper;
import co.elastic.clients.json.ObjectBuilderDeserializer;
import co.elastic.clients.json.ObjectDeserializer;
-import co.elastic.clients.util.ApiTypeHelper;
import co.elastic.clients.util.ObjectBuilder;
import jakarta.json.stream.JsonGenerator;
import java.lang.Boolean;
import java.util.Objects;
import java.util.function.Function;
+import javax.annotation.Nullable;
// typedef: _types.analysis.AsciiFoldingTokenFilter
@@ -45,14 +45,15 @@
*/
@JsonpDeserializable
public class AsciiFoldingTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
- private final boolean preserveOriginal;
+ @Nullable
+ private final Boolean preserveOriginal;
// ---------------------------------------------------------------------------------------------
private AsciiFoldingTokenFilter(Builder builder) {
super(builder);
- this.preserveOriginal = ApiTypeHelper.requireNonNull(builder.preserveOriginal, this, "preserveOriginal");
+ this.preserveOriginal = builder.preserveOriginal;
}
@@ -69,9 +70,10 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
}
/**
- * Required - API name: {@code preserve_original}
+ * API name: {@code preserve_original}
*/
- public final boolean preserveOriginal() {
+ @Nullable
+ public final Boolean preserveOriginal() {
return this.preserveOriginal;
}
@@ -79,8 +81,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
generator.write("type", "asciifolding");
super.serializeInternal(generator, mapper);
- generator.writeKey("preserve_original");
- generator.write(this.preserveOriginal);
+ if (this.preserveOriginal != null) {
+ generator.writeKey("preserve_original");
+ generator.write(this.preserveOriginal);
+
+ }
}
@@ -93,12 +98,13 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
public static class Builder extends TokenFilterBase.AbstractBuilder
implements
ObjectBuilder {
+ @Nullable
private Boolean preserveOriginal;
/**
- * Required - API name: {@code preserve_original}
+ * API name: {@code preserve_original}
*/
- public final Builder preserveOriginal(boolean value) {
+ public final Builder preserveOriginal(@Nullable Boolean value) {
this.preserveOriginal = value;
return this;
}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/DelimitedPayloadTokenFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/DelimitedPayloadTokenFilter.java
index cc13d54e8..9fc23fde2 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/DelimitedPayloadTokenFilter.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/DelimitedPayloadTokenFilter.java
@@ -28,7 +28,6 @@
import co.elastic.clients.json.JsonpMapper;
import co.elastic.clients.json.ObjectBuilderDeserializer;
import co.elastic.clients.json.ObjectDeserializer;
-import co.elastic.clients.util.ApiTypeHelper;
import co.elastic.clients.util.ObjectBuilder;
import jakarta.json.stream.JsonGenerator;
import java.lang.String;
@@ -46,8 +45,10 @@
*/
@JsonpDeserializable
public class DelimitedPayloadTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+ @Nullable
private final String delimiter;
+ @Nullable
private final DelimitedPayloadEncoding encoding;
// ---------------------------------------------------------------------------------------------
@@ -55,8 +56,8 @@ public class DelimitedPayloadTokenFilter extends TokenFilterBase implements Toke
private DelimitedPayloadTokenFilter(Builder builder) {
super(builder);
- this.delimiter = ApiTypeHelper.requireNonNull(builder.delimiter, this, "delimiter");
- this.encoding = ApiTypeHelper.requireNonNull(builder.encoding, this, "encoding");
+ this.delimiter = builder.delimiter;
+ this.encoding = builder.encoding;
}
@@ -73,15 +74,17 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
}
/**
- * Required - API name: {@code delimiter}
+ * API name: {@code delimiter}
*/
+ @Nullable
public final String delimiter() {
return this.delimiter;
}
/**
- * Required - API name: {@code encoding}
+ * API name: {@code encoding}
*/
+ @Nullable
public final DelimitedPayloadEncoding encoding() {
return this.encoding;
}
@@ -90,11 +93,15 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
generator.write("type", "delimited_payload");
super.serializeInternal(generator, mapper);
- generator.writeKey("delimiter");
- generator.write(this.delimiter);
+ if (this.delimiter != null) {
+ generator.writeKey("delimiter");
+ generator.write(this.delimiter);
- generator.writeKey("encoding");
- this.encoding.serialize(generator, mapper);
+ }
+ if (this.encoding != null) {
+ generator.writeKey("encoding");
+ this.encoding.serialize(generator, mapper);
+ }
}
@@ -107,22 +114,24 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
public static class Builder extends TokenFilterBase.AbstractBuilder
implements
ObjectBuilder {
+ @Nullable
private String delimiter;
+ @Nullable
private DelimitedPayloadEncoding encoding;
/**
- * Required - API name: {@code delimiter}
+ * API name: {@code delimiter}
*/
- public final Builder delimiter(String value) {
+ public final Builder delimiter(@Nullable String value) {
this.delimiter = value;
return this;
}
/**
- * Required - API name: {@code encoding}
+ * API name: {@code encoding}
*/
- public final Builder encoding(DelimitedPayloadEncoding value) {
+ public final Builder encoding(@Nullable DelimitedPayloadEncoding value) {
this.encoding = value;
return this;
}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/EdgeNGramTokenFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/EdgeNGramTokenFilter.java
index 13d7dee95..6ee6cb075 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/EdgeNGramTokenFilter.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/EdgeNGramTokenFilter.java
@@ -28,7 +28,6 @@
import co.elastic.clients.json.JsonpMapper;
import co.elastic.clients.json.ObjectBuilderDeserializer;
import co.elastic.clients.json.ObjectDeserializer;
-import co.elastic.clients.util.ApiTypeHelper;
import co.elastic.clients.util.ObjectBuilder;
import jakarta.json.stream.JsonGenerator;
import java.lang.Boolean;
@@ -47,9 +46,11 @@
*/
@JsonpDeserializable
public class EdgeNGramTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
- private final int maxGram;
+ @Nullable
+ private final Integer maxGram;
- private final int minGram;
+ @Nullable
+ private final Integer minGram;
@Nullable
private final EdgeNGramSide side;
@@ -62,8 +63,8 @@ public class EdgeNGramTokenFilter extends TokenFilterBase implements TokenFilter
private EdgeNGramTokenFilter(Builder builder) {
super(builder);
- this.maxGram = ApiTypeHelper.requireNonNull(builder.maxGram, this, "maxGram");
- this.minGram = ApiTypeHelper.requireNonNull(builder.minGram, this, "minGram");
+ this.maxGram = builder.maxGram;
+ this.minGram = builder.minGram;
this.side = builder.side;
this.preserveOriginal = builder.preserveOriginal;
@@ -82,16 +83,18 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
}
/**
- * Required - API name: {@code max_gram}
+ * API name: {@code max_gram}
*/
- public final int maxGram() {
+ @Nullable
+ public final Integer maxGram() {
return this.maxGram;
}
/**
- * Required - API name: {@code min_gram}
+ * API name: {@code min_gram}
*/
- public final int minGram() {
+ @Nullable
+ public final Integer minGram() {
return this.minGram;
}
@@ -115,12 +118,16 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
generator.write("type", "edge_ngram");
super.serializeInternal(generator, mapper);
- generator.writeKey("max_gram");
- generator.write(this.maxGram);
+ if (this.maxGram != null) {
+ generator.writeKey("max_gram");
+ generator.write(this.maxGram);
- generator.writeKey("min_gram");
- generator.write(this.minGram);
+ }
+ if (this.minGram != null) {
+ generator.writeKey("min_gram");
+ generator.write(this.minGram);
+ }
if (this.side != null) {
generator.writeKey("side");
this.side.serialize(generator, mapper);
@@ -142,8 +149,10 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
public static class Builder extends TokenFilterBase.AbstractBuilder
implements
ObjectBuilder {
+ @Nullable
private Integer maxGram;
+ @Nullable
private Integer minGram;
@Nullable
@@ -153,17 +162,17 @@ public static class Builder extends TokenFilterBase.AbstractBuilder
private Boolean preserveOriginal;
/**
- * Required - API name: {@code max_gram}
+ * API name: {@code max_gram}
*/
- public final Builder maxGram(int value) {
+ public final Builder maxGram(@Nullable Integer value) {
this.maxGram = value;
return this;
}
/**
- * Required - API name: {@code min_gram}
+ * API name: {@code min_gram}
*/
- public final Builder minGram(int value) {
+ public final Builder minGram(@Nullable Integer value) {
this.minGram = value;
return this;
}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/ElisionTokenFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/ElisionTokenFilter.java
index 3c127ec98..3505500f5 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/ElisionTokenFilter.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/ElisionTokenFilter.java
@@ -50,15 +50,20 @@
public class ElisionTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
private final List articles;
- private final boolean articlesCase;
+ @Nullable
+ private final String articlesPath;
+
+ @Nullable
+ private final Boolean articlesCase;
// ---------------------------------------------------------------------------------------------
private ElisionTokenFilter(Builder builder) {
super(builder);
- this.articles = ApiTypeHelper.unmodifiableRequired(builder.articles, this, "articles");
- this.articlesCase = ApiTypeHelper.requireNonNull(builder.articlesCase, this, "articlesCase");
+ this.articles = ApiTypeHelper.unmodifiable(builder.articles);
+ this.articlesPath = builder.articlesPath;
+ this.articlesCase = builder.articlesCase;
}
@@ -75,16 +80,25 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
}
/**
- * Required - API name: {@code articles}
+ * API name: {@code articles}
*/
public final List articles() {
return this.articles;
}
/**
- * Required - API name: {@code articles_case}
+ * API name: {@code articles_path}
+ */
+ @Nullable
+ public final String articlesPath() {
+ return this.articlesPath;
+ }
+
+ /**
+ * API name: {@code articles_case}
*/
- public final boolean articlesCase() {
+ @Nullable
+ public final Boolean articlesCase() {
return this.articlesCase;
}
@@ -102,8 +116,16 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
generator.writeEnd();
}
- generator.writeKey("articles_case");
- generator.write(this.articlesCase);
+ if (this.articlesPath != null) {
+ generator.writeKey("articles_path");
+ generator.write(this.articlesPath);
+
+ }
+ if (this.articlesCase != null) {
+ generator.writeKey("articles_case");
+ generator.write(this.articlesCase);
+
+ }
}
@@ -116,12 +138,17 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
public static class Builder extends TokenFilterBase.AbstractBuilder
implements
ObjectBuilder {
+ @Nullable
private List articles;
+ @Nullable
+ private String articlesPath;
+
+ @Nullable
private Boolean articlesCase;
/**
- * Required - API name: {@code articles}
+ * API name: {@code articles}
*
* Adds all elements of list to articles.
*/
@@ -131,7 +158,7 @@ public final Builder articles(List list) {
}
/**
- * Required - API name: {@code articles}
+ * API name: {@code articles}
*
* Adds one or more values to articles.
*/
@@ -141,9 +168,17 @@ public final Builder articles(String value, String... values) {
}
/**
- * Required - API name: {@code articles_case}
+ * API name: {@code articles_path}
+ */
+ public final Builder articlesPath(@Nullable String value) {
+ this.articlesPath = value;
+ return this;
+ }
+
+ /**
+ * API name: {@code articles_case}
*/
- public final Builder articlesCase(boolean value) {
+ public final Builder articlesCase(@Nullable Boolean value) {
this.articlesCase = value;
return this;
}
@@ -178,6 +213,7 @@ protected static void setupElisionTokenFilterDeserializer(ObjectDeserializer
implements
ObjectBuilder {
+ @Nullable
private Integer maxOutputSize;
+ @Nullable
private String separator;
/**
- * Required - API name: {@code max_output_size}
+ * API name: {@code max_output_size}
*/
- public final Builder maxOutputSize(int value) {
+ public final Builder maxOutputSize(@Nullable Integer value) {
this.maxOutputSize = value;
return this;
}
/**
- * Required - API name: {@code separator}
+ * API name: {@code separator}
*/
- public final Builder separator(String value) {
+ public final Builder separator(@Nullable String value) {
this.separator = value;
return this;
}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/HunspellTokenFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/HunspellTokenFilter.java
index f5f2fe90f..c32140f2a 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/HunspellTokenFilter.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/HunspellTokenFilter.java
@@ -47,23 +47,26 @@
*/
@JsonpDeserializable
public class HunspellTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
- private final boolean dedup;
+ @Nullable
+ private final Boolean dedup;
+ @Nullable
private final String dictionary;
private final String locale;
- private final boolean longestOnly;
+ @Nullable
+ private final Boolean longestOnly;
// ---------------------------------------------------------------------------------------------
private HunspellTokenFilter(Builder builder) {
super(builder);
- this.dedup = ApiTypeHelper.requireNonNull(builder.dedup, this, "dedup");
- this.dictionary = ApiTypeHelper.requireNonNull(builder.dictionary, this, "dictionary");
+ this.dedup = builder.dedup;
+ this.dictionary = builder.dictionary;
this.locale = ApiTypeHelper.requireNonNull(builder.locale, this, "locale");
- this.longestOnly = ApiTypeHelper.requireNonNull(builder.longestOnly, this, "longestOnly");
+ this.longestOnly = builder.longestOnly;
}
@@ -80,15 +83,17 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
}
/**
- * Required - API name: {@code dedup}
+ * API name: {@code dedup}
*/
- public final boolean dedup() {
+ @Nullable
+ public final Boolean dedup() {
return this.dedup;
}
/**
- * Required - API name: {@code dictionary}
+ * API name: {@code dictionary}
*/
+ @Nullable
public final String dictionary() {
return this.dictionary;
}
@@ -101,9 +106,10 @@ public final String locale() {
}
/**
- * Required - API name: {@code longest_only}
+ * API name: {@code longest_only}
*/
- public final boolean longestOnly() {
+ @Nullable
+ public final Boolean longestOnly() {
return this.longestOnly;
}
@@ -111,17 +117,24 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
generator.write("type", "hunspell");
super.serializeInternal(generator, mapper);
- generator.writeKey("dedup");
- generator.write(this.dedup);
+ if (this.dedup != null) {
+ generator.writeKey("dedup");
+ generator.write(this.dedup);
- generator.writeKey("dictionary");
- generator.write(this.dictionary);
+ }
+ if (this.dictionary != null) {
+ generator.writeKey("dictionary");
+ generator.write(this.dictionary);
+ }
generator.writeKey("locale");
generator.write(this.locale);
- generator.writeKey("longest_only");
- generator.write(this.longestOnly);
+ if (this.longestOnly != null) {
+ generator.writeKey("longest_only");
+ generator.write(this.longestOnly);
+
+ }
}
@@ -134,26 +147,29 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
public static class Builder extends TokenFilterBase.AbstractBuilder
implements
ObjectBuilder {
+ @Nullable
private Boolean dedup;
+ @Nullable
private String dictionary;
private String locale;
+ @Nullable
private Boolean longestOnly;
/**
- * Required - API name: {@code dedup}
+ * API name: {@code dedup}
*/
- public final Builder dedup(boolean value) {
+ public final Builder dedup(@Nullable Boolean value) {
this.dedup = value;
return this;
}
/**
- * Required - API name: {@code dictionary}
+ * API name: {@code dictionary}
*/
- public final Builder dictionary(String value) {
+ public final Builder dictionary(@Nullable String value) {
this.dictionary = value;
return this;
}
@@ -167,9 +183,9 @@ public final Builder locale(String value) {
}
/**
- * Required - API name: {@code longest_only}
+ * API name: {@code longest_only}
*/
- public final Builder longestOnly(boolean value) {
+ public final Builder longestOnly(@Nullable Boolean value) {
this.longestOnly = value;
return this;
}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/LengthTokenFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/LengthTokenFilter.java
index 4e6c5dd9f..0d6f69e13 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/LengthTokenFilter.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/LengthTokenFilter.java
@@ -28,12 +28,12 @@
import co.elastic.clients.json.JsonpMapper;
import co.elastic.clients.json.ObjectBuilderDeserializer;
import co.elastic.clients.json.ObjectDeserializer;
-import co.elastic.clients.util.ApiTypeHelper;
import co.elastic.clients.util.ObjectBuilder;
import jakarta.json.stream.JsonGenerator;
import java.lang.Integer;
import java.util.Objects;
import java.util.function.Function;
+import javax.annotation.Nullable;
// typedef: _types.analysis.LengthTokenFilter
@@ -45,17 +45,19 @@
*/
@JsonpDeserializable
public class LengthTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
- private final int max;
+ @Nullable
+ private final Integer max;
- private final int min;
+ @Nullable
+ private final Integer min;
// ---------------------------------------------------------------------------------------------
private LengthTokenFilter(Builder builder) {
super(builder);
- this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
- this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
+ this.max = builder.max;
+ this.min = builder.min;
}
@@ -72,16 +74,18 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
}
/**
- * Required - API name: {@code max}
+ * API name: {@code max}
*/
- public final int max() {
+ @Nullable
+ public final Integer max() {
return this.max;
}
/**
- * Required - API name: {@code min}
+ * API name: {@code min}
*/
- public final int min() {
+ @Nullable
+ public final Integer min() {
return this.min;
}
@@ -89,11 +93,16 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
generator.write("type", "length");
super.serializeInternal(generator, mapper);
- generator.writeKey("max");
- generator.write(this.max);
+ if (this.max != null) {
+ generator.writeKey("max");
+ generator.write(this.max);
- generator.writeKey("min");
- generator.write(this.min);
+ }
+ if (this.min != null) {
+ generator.writeKey("min");
+ generator.write(this.min);
+
+ }
}
@@ -106,22 +115,24 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
public static class Builder extends TokenFilterBase.AbstractBuilder
implements
ObjectBuilder {
+ @Nullable
private Integer max;
+ @Nullable
private Integer min;
/**
- * Required - API name: {@code max}
+ * API name: {@code max}
*/
- public final Builder max(int value) {
+ public final Builder max(@Nullable Integer value) {
this.max = value;
return this;
}
/**
- * Required - API name: {@code min}
+ * API name: {@code min}
*/
- public final Builder min(int value) {
+ public final Builder min(@Nullable Integer value) {
this.min = value;
return this;
}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/LimitTokenCountTokenFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/LimitTokenCountTokenFilter.java
index 6abc0754a..e035c944d 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/LimitTokenCountTokenFilter.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/LimitTokenCountTokenFilter.java
@@ -28,13 +28,13 @@
import co.elastic.clients.json.JsonpMapper;
import co.elastic.clients.json.ObjectBuilderDeserializer;
import co.elastic.clients.json.ObjectDeserializer;
-import co.elastic.clients.util.ApiTypeHelper;
import co.elastic.clients.util.ObjectBuilder;
import jakarta.json.stream.JsonGenerator;
import java.lang.Boolean;
import java.lang.Integer;
import java.util.Objects;
import java.util.function.Function;
+import javax.annotation.Nullable;
// typedef: _types.analysis.LimitTokenCountTokenFilter
@@ -46,17 +46,19 @@
*/
@JsonpDeserializable
public class LimitTokenCountTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
- private final boolean consumeAllTokens;
+ @Nullable
+ private final Boolean consumeAllTokens;
- private final int maxTokenCount;
+ @Nullable
+ private final Integer maxTokenCount;
// ---------------------------------------------------------------------------------------------
private LimitTokenCountTokenFilter(Builder builder) {
super(builder);
- this.consumeAllTokens = ApiTypeHelper.requireNonNull(builder.consumeAllTokens, this, "consumeAllTokens");
- this.maxTokenCount = ApiTypeHelper.requireNonNull(builder.maxTokenCount, this, "maxTokenCount");
+ this.consumeAllTokens = builder.consumeAllTokens;
+ this.maxTokenCount = builder.maxTokenCount;
}
@@ -73,16 +75,18 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
}
/**
- * Required - API name: {@code consume_all_tokens}
+ * API name: {@code consume_all_tokens}
*/
- public final boolean consumeAllTokens() {
+ @Nullable
+ public final Boolean consumeAllTokens() {
return this.consumeAllTokens;
}
/**
- * Required - API name: {@code max_token_count}
+ * API name: {@code max_token_count}
*/
- public final int maxTokenCount() {
+ @Nullable
+ public final Integer maxTokenCount() {
return this.maxTokenCount;
}
@@ -90,11 +94,16 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
generator.write("type", "limit");
super.serializeInternal(generator, mapper);
- generator.writeKey("consume_all_tokens");
- generator.write(this.consumeAllTokens);
+ if (this.consumeAllTokens != null) {
+ generator.writeKey("consume_all_tokens");
+ generator.write(this.consumeAllTokens);
- generator.writeKey("max_token_count");
- generator.write(this.maxTokenCount);
+ }
+ if (this.maxTokenCount != null) {
+ generator.writeKey("max_token_count");
+ generator.write(this.maxTokenCount);
+
+ }
}
@@ -107,22 +116,24 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
public static class Builder extends TokenFilterBase.AbstractBuilder
implements
ObjectBuilder {
+ @Nullable
private Boolean consumeAllTokens;
+ @Nullable
private Integer maxTokenCount;
/**
- * Required - API name: {@code consume_all_tokens}
+ * API name: {@code consume_all_tokens}
*/
- public final Builder consumeAllTokens(boolean value) {
+ public final Builder consumeAllTokens(@Nullable Boolean value) {
this.consumeAllTokens = value;
return this;
}
/**
- * Required - API name: {@code max_token_count}
+ * API name: {@code max_token_count}
*/
- public final Builder maxTokenCount(int value) {
+ public final Builder maxTokenCount(@Nullable Integer value) {
this.maxTokenCount = value;
return this;
}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/MultiplexerTokenFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/MultiplexerTokenFilter.java
index 88357e32d..8a221a22d 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/MultiplexerTokenFilter.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/MultiplexerTokenFilter.java
@@ -50,7 +50,8 @@
public class MultiplexerTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
private final List filters;
- private final boolean preserveOriginal;
+ @Nullable
+ private final Boolean preserveOriginal;
// ---------------------------------------------------------------------------------------------
@@ -58,7 +59,7 @@ private MultiplexerTokenFilter(Builder builder) {
super(builder);
this.filters = ApiTypeHelper.unmodifiableRequired(builder.filters, this, "filters");
- this.preserveOriginal = ApiTypeHelper.requireNonNull(builder.preserveOriginal, this, "preserveOriginal");
+ this.preserveOriginal = builder.preserveOriginal;
}
@@ -82,9 +83,10 @@ public final List filters() {
}
/**
- * Required - API name: {@code preserve_original}
+ * API name: {@code preserve_original}
*/
- public final boolean preserveOriginal() {
+ @Nullable
+ public final Boolean preserveOriginal() {
return this.preserveOriginal;
}
@@ -102,8 +104,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
generator.writeEnd();
}
- generator.writeKey("preserve_original");
- generator.write(this.preserveOriginal);
+ if (this.preserveOriginal != null) {
+ generator.writeKey("preserve_original");
+ generator.write(this.preserveOriginal);
+
+ }
}
@@ -118,6 +123,7 @@ public static class Builder extends TokenFilterBase.AbstractBuilder
ObjectBuilder {
private List filters;
+ @Nullable
private Boolean preserveOriginal;
/**
@@ -141,9 +147,9 @@ public final Builder filters(String value, String... values) {
}
/**
- * Required - API name: {@code preserve_original}
+ * API name: {@code preserve_original}
*/
- public final Builder preserveOriginal(boolean value) {
+ public final Builder preserveOriginal(@Nullable Boolean value) {
this.preserveOriginal = value;
return this;
}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/NoriPartOfSpeechTokenFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/NoriPartOfSpeechTokenFilter.java
index 67c04934b..56092eb10 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/NoriPartOfSpeechTokenFilter.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/NoriPartOfSpeechTokenFilter.java
@@ -54,7 +54,7 @@ public class NoriPartOfSpeechTokenFilter extends TokenFilterBase implements Toke
private NoriPartOfSpeechTokenFilter(Builder builder) {
super(builder);
- this.stoptags = ApiTypeHelper.unmodifiableRequired(builder.stoptags, this, "stoptags");
+ this.stoptags = ApiTypeHelper.unmodifiable(builder.stoptags);
}
@@ -71,7 +71,7 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
}
/**
- * Required - API name: {@code stoptags}
+ * API name: {@code stoptags}
*/
public final List stoptags() {
return this.stoptags;
@@ -103,10 +103,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
public static class Builder extends TokenFilterBase.AbstractBuilder
implements
ObjectBuilder {
+ @Nullable
private List stoptags;
/**
- * Required - API name: {@code stoptags}
+ * API name: {@code stoptags}
*
* Adds all elements of list to stoptags.
*/
@@ -116,7 +117,7 @@ public final Builder stoptags(List list) {
}
/**
- * Required - API name: {@code stoptags}
+ * API name: {@code stoptags}
*
* Adds one or more values to stoptags.
*/
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/PatternCaptureTokenFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/PatternCaptureTokenFilter.java
index 172c8126e..5b2d569de 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/PatternCaptureTokenFilter.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/PatternCaptureTokenFilter.java
@@ -50,7 +50,8 @@
public class PatternCaptureTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
private final List patterns;
- private final boolean preserveOriginal;
+ @Nullable
+ private final Boolean preserveOriginal;
// ---------------------------------------------------------------------------------------------
@@ -58,7 +59,7 @@ private PatternCaptureTokenFilter(Builder builder) {
super(builder);
this.patterns = ApiTypeHelper.unmodifiableRequired(builder.patterns, this, "patterns");
- this.preserveOriginal = ApiTypeHelper.requireNonNull(builder.preserveOriginal, this, "preserveOriginal");
+ this.preserveOriginal = builder.preserveOriginal;
}
@@ -82,9 +83,10 @@ public final List patterns() {
}
/**
- * Required - API name: {@code preserve_original}
+ * API name: {@code preserve_original}
*/
- public final boolean preserveOriginal() {
+ @Nullable
+ public final Boolean preserveOriginal() {
return this.preserveOriginal;
}
@@ -102,8 +104,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
generator.writeEnd();
}
- generator.writeKey("preserve_original");
- generator.write(this.preserveOriginal);
+ if (this.preserveOriginal != null) {
+ generator.writeKey("preserve_original");
+ generator.write(this.preserveOriginal);
+
+ }
}
@@ -118,6 +123,7 @@ public static class Builder extends TokenFilterBase.AbstractBuilder
ObjectBuilder {
private List patterns;
+ @Nullable
private Boolean preserveOriginal;
/**
@@ -141,9 +147,9 @@ public final Builder patterns(String value, String... values) {
}
/**
- * Required - API name: {@code preserve_original}
+ * API name: {@code preserve_original}
*/
- public final Builder preserveOriginal(boolean value) {
+ public final Builder preserveOriginal(@Nullable Boolean value) {
this.preserveOriginal = value;
return this;
}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/PatternReplaceTokenFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/PatternReplaceTokenFilter.java
index c5f92cb04..81778fbc4 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/PatternReplaceTokenFilter.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/PatternReplaceTokenFilter.java
@@ -31,6 +31,7 @@
import co.elastic.clients.util.ApiTypeHelper;
import co.elastic.clients.util.ObjectBuilder;
import jakarta.json.stream.JsonGenerator;
+import java.lang.Boolean;
import java.lang.String;
import java.util.Objects;
import java.util.function.Function;
@@ -46,10 +47,15 @@
*/
@JsonpDeserializable
public class PatternReplaceTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+ @Nullable
+ private final Boolean all;
+
+ @Nullable
private final String flags;
private final String pattern;
+ @Nullable
private final String replacement;
// ---------------------------------------------------------------------------------------------
@@ -57,9 +63,10 @@ public class PatternReplaceTokenFilter extends TokenFilterBase implements TokenF
private PatternReplaceTokenFilter(Builder builder) {
super(builder);
- this.flags = ApiTypeHelper.requireNonNull(builder.flags, this, "flags");
+ this.all = builder.all;
+ this.flags = builder.flags;
this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
- this.replacement = ApiTypeHelper.requireNonNull(builder.replacement, this, "replacement");
+ this.replacement = builder.replacement;
}
@@ -76,8 +83,17 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
}
/**
- * Required - API name: {@code flags}
+ * API name: {@code all}
+ */
+ @Nullable
+ public final Boolean all() {
+ return this.all;
+ }
+
+ /**
+ * API name: {@code flags}
*/
+ @Nullable
public final String flags() {
return this.flags;
}
@@ -90,8 +106,9 @@ public final String pattern() {
}
/**
- * Required - API name: {@code replacement}
+ * API name: {@code replacement}
*/
+ @Nullable
public final String replacement() {
return this.replacement;
}
@@ -100,14 +117,24 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
generator.write("type", "pattern_replace");
super.serializeInternal(generator, mapper);
- generator.writeKey("flags");
- generator.write(this.flags);
+ if (this.all != null) {
+ generator.writeKey("all");
+ generator.write(this.all);
+
+ }
+ if (this.flags != null) {
+ generator.writeKey("flags");
+ generator.write(this.flags);
+ }
generator.writeKey("pattern");
generator.write(this.pattern);
- generator.writeKey("replacement");
- generator.write(this.replacement);
+ if (this.replacement != null) {
+ generator.writeKey("replacement");
+ generator.write(this.replacement);
+
+ }
}
@@ -120,16 +147,29 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
public static class Builder extends TokenFilterBase.AbstractBuilder
implements
ObjectBuilder {
+ @Nullable
+ private Boolean all;
+
+ @Nullable
private String flags;
private String pattern;
+ @Nullable
private String replacement;
/**
- * Required - API name: {@code flags}
+ * API name: {@code all}
+ */
+ public final Builder all(@Nullable Boolean value) {
+ this.all = value;
+ return this;
+ }
+
+ /**
+ * API name: {@code flags}
*/
- public final Builder flags(String value) {
+ public final Builder flags(@Nullable String value) {
this.flags = value;
return this;
}
@@ -143,9 +183,9 @@ public final Builder pattern(String value) {
}
/**
- * Required - API name: {@code replacement}
+ * API name: {@code replacement}
*/
- public final Builder replacement(String value) {
+ public final Builder replacement(@Nullable String value) {
this.replacement = value;
return this;
}
@@ -179,6 +219,7 @@ public PatternReplaceTokenFilter build() {
protected static void setupPatternReplaceTokenFilterDeserializer(
ObjectDeserializer op) {
TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+ op.add(Builder::all, JsonpDeserializer.booleanDeserializer(), "all");
op.add(Builder::flags, JsonpDeserializer.stringDeserializer(), "flags");
op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
op.add(Builder::replacement, JsonpDeserializer.stringDeserializer(), "replacement");
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/StopTokenFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/StopTokenFilter.java
index e62c3c906..ddde59ea0 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/StopTokenFilter.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/StopTokenFilter.java
@@ -66,7 +66,7 @@ private StopTokenFilter(Builder builder) {
this.ignoreCase = builder.ignoreCase;
this.removeTrailing = builder.removeTrailing;
- this.stopwords = ApiTypeHelper.unmodifiableRequired(builder.stopwords, this, "stopwords");
+ this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
this.stopwordsPath = builder.stopwordsPath;
}
@@ -100,7 +100,7 @@ public final Boolean removeTrailing() {
}
/**
- * Required - API name: {@code stopwords}
+ * API name: {@code stopwords}
*/
public final List stopwords() {
return this.stopwords;
@@ -161,6 +161,7 @@ public static class Builder extends TokenFilterBase.AbstractBuilder
@Nullable
private Boolean removeTrailing;
+ @Nullable
private List stopwords;
@Nullable
@@ -183,7 +184,7 @@ public final Builder removeTrailing(@Nullable Boolean value) {
}
/**
- * Required - API name: {@code stopwords}
+ * API name: {@code stopwords}
*
* Adds all elements of list to stopwords.
*/
@@ -193,7 +194,7 @@ public final Builder stopwords(List list) {
}
/**
- * Required - API name: {@code stopwords}
+ * API name: {@code stopwords}
*
* Adds one or more values to stopwords.
*/
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TruncateTokenFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TruncateTokenFilter.java
index a80a50148..c297f59f1 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TruncateTokenFilter.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TruncateTokenFilter.java
@@ -28,12 +28,12 @@
import co.elastic.clients.json.JsonpMapper;
import co.elastic.clients.json.ObjectBuilderDeserializer;
import co.elastic.clients.json.ObjectDeserializer;
-import co.elastic.clients.util.ApiTypeHelper;
import co.elastic.clients.util.ObjectBuilder;
import jakarta.json.stream.JsonGenerator;
import java.lang.Integer;
import java.util.Objects;
import java.util.function.Function;
+import javax.annotation.Nullable;
// typedef: _types.analysis.TruncateTokenFilter
@@ -45,14 +45,15 @@
*/
@JsonpDeserializable
public class TruncateTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
- private final int length;
+ @Nullable
+ private final Integer length;
// ---------------------------------------------------------------------------------------------
private TruncateTokenFilter(Builder builder) {
super(builder);
- this.length = ApiTypeHelper.requireNonNull(builder.length, this, "length");
+ this.length = builder.length;
}
@@ -69,9 +70,10 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
}
/**
- * Required - API name: {@code length}
+ * API name: {@code length}
*/
- public final int length() {
+ @Nullable
+ public final Integer length() {
return this.length;
}
@@ -79,8 +81,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
generator.write("type", "truncate");
super.serializeInternal(generator, mapper);
- generator.writeKey("length");
- generator.write(this.length);
+ if (this.length != null) {
+ generator.writeKey("length");
+ generator.write(this.length);
+
+ }
}
@@ -93,12 +98,13 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
public static class Builder extends TokenFilterBase.AbstractBuilder
implements
ObjectBuilder {
+ @Nullable
private Integer length;
/**
- * Required - API name: {@code length}
+ * API name: {@code length}
*/
- public final Builder length(int value) {
+ public final Builder length(@Nullable Integer value) {
this.length = value;
return this;
}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/FieldMapping.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/FieldMapping.java
index 88f80aeeb..5c699b03d 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/FieldMapping.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/FieldMapping.java
@@ -49,9 +49,6 @@
*/
@JsonpDeserializable
public class FieldMapping implements JsonpSerializable {
- // Single key dictionary
- private final String field;
-
private final String fullName;
private final Map mapping;
@@ -60,8 +57,6 @@ public class FieldMapping implements JsonpSerializable {
private FieldMapping(Builder builder) {
- this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
this.fullName = ApiTypeHelper.requireNonNull(builder.fullName, this, "fullName");
this.mapping = ApiTypeHelper.unmodifiableRequired(builder.mapping, this, "mapping");
@@ -71,13 +66,6 @@ public static FieldMapping of(Function> fn)
return fn.apply(new Builder()).build();
}
- /**
- * Required - The target field
- */
- public final String field() {
- return this.field;
- }
-
/**
* Required - API name: {@code full_name}
*/
@@ -102,7 +90,6 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
}
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
- generator.writeStartObject(this.field);
generator.writeKey("full_name");
generator.write(this.fullName);
@@ -119,8 +106,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
}
- generator.writeEnd();
-
}
@Override
@@ -135,16 +120,6 @@ public String toString() {
*/
public static class Builder extends WithJsonObjectBuilderBase implements ObjectBuilder {
- private String field;
-
- /**
- * Required - The target field
- */
- public final Builder field(String value) {
- this.field = value;
- return this;
- }
-
private String fullName;
private Map mapping;
@@ -217,8 +192,6 @@ protected static void setupFieldMappingDeserializer(ObjectDeserializer 1) {
hash = hash.substring(1);
}
- window.location = "https://github.com/elastic/elasticsearch-specification/tree/d4e6f15987391750eafc747b997b776e70bc85a7/specification/" + (paths[hash] || "");
+ window.location = "https://github.com/elastic/elasticsearch-specification/tree/cda51c1e6118ea3ba2bb973b77fbf5dc32badebc/specification/" + (paths[hash] || "");
- Please see the Elasticsearch API specification.
+ Please see the Elasticsearch API specification.