From 1d5d786ec1cc00ef760d2cc1816c0ad5beaa07aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Jehli=C4=8Dka?= Date: Wed, 8 Feb 2023 13:04:56 +0100 Subject: [PATCH 1/2] Rename `storedFiled` in InnerHits to `storedFields` --- .../elasticsearch/core/search/InnerHits.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/InnerHits.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/InnerHits.java index 400769ef7e..71ba152cab 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/InnerHits.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/InnerHits.java @@ -91,7 +91,7 @@ public class InnerHits implements JsonpSerializable { @Nullable private final SourceConfig source; - private final List storedField; + private final List storedFields; @Nullable private final Boolean trackScores; @@ -116,7 +116,7 @@ private InnerHits(Builder builder) { this.fields = ApiTypeHelper.unmodifiable(builder.fields); this.sort = ApiTypeHelper.unmodifiable(builder.sort); this.source = builder.source; - this.storedField = ApiTypeHelper.unmodifiable(builder.storedField); + this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields); this.trackScores = builder.trackScores; this.version = builder.version; @@ -227,10 +227,10 @@ public final SourceConfig source() { } /** - * API name: {@code stored_field} + * API name: {@code stored_fields} */ - public final List storedField() { - return this.storedField; + public final List storedFields() { + return this.storedFields; } /** @@ -346,10 +346,10 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { this.source.serialize(generator, mapper); } - if (ApiTypeHelper.isDefined(this.storedField)) { - generator.writeKey("stored_field"); + if (ApiTypeHelper.isDefined(this.storedFields)) { + generator.writeKey("stored_fields"); generator.writeStartArray(); - for (String item0 : this.storedField) { + for (String item0 : this.storedFields) { generator.write(item0); } @@ -421,7 +421,7 @@ public static class Builder extends WithJsonObjectBuilderBase implement private SourceConfig source; @Nullable - private List storedField; + private List storedFields; @Nullable private Boolean trackScores; @@ -632,20 +632,20 @@ public final Builder source(Function - * Adds all elements of list to storedField. + * Adds all elements of list to storedFields. */ - public final Builder storedField(List list) { - this.storedField = _listAddAll(this.storedField, list); + public final Builder storedFields(List list) { + this.storedFields = _listAddAll(this.storedFields, list); return this; } /** * API name: {@code stored_field} *

- * Adds one or more values to storedField. + * Adds one or more values to storedFields. */ - public final Builder storedField(String value, String... values) { - this.storedField = _listAdd(this.storedField, value, values); + public final Builder storedFields(String value, String... values) { + this.storedFields = _listAdd(this.storedFields, value, values); return this; } @@ -708,8 +708,8 @@ protected static void setupInnerHitsDeserializer(ObjectDeserializer Date: Wed, 8 Feb 2023 14:45:13 +0100 Subject: [PATCH 2/2] Add force build optional to query/request/aggregation builders - force() - allows to build object from builder more than once --- .../elasticsearch/_types/RequestBase.java | 6 +++++ .../_types/aggregations/Aggregation.java | 9 ++++++++ .../_types/aggregations/TermsAggregation.java | 23 +++++++++++++++++++ .../elasticsearch/_types/query_dsl/Query.java | 4 ++++ .../_types/query_dsl/QueryBase.java | 5 ++++ .../clients/util/ObjectBuilderBase.java | 4 ++++ .../util/WithJsonObjectBuilderBase.java | 1 - 7 files changed, 51 insertions(+), 1 deletion(-) diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/RequestBase.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/RequestBase.java index c1469bfd2d..4563d166ac 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/RequestBase.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/RequestBase.java @@ -53,6 +53,12 @@ public RequestBase() { public abstract static class AbstractBuilder> extends WithJsonObjectBuilderBase { + + public final BuilderT force() { + _force(); + return self(); + } + protected abstract BuilderT self(); } diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Aggregation.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Aggregation.java index 83c324744b..64a84cc56b 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Aggregation.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Aggregation.java @@ -2520,6 +2520,10 @@ protected Aggregation build() { return new Aggregation(this); } + protected void force(){ + _force(); + } + public class ContainerBuilder implements ObjectBuilder { /** @@ -2581,6 +2585,11 @@ public final ContainerBuilder meta(String key, JsonData value) { public Aggregation build() { return Builder.this.build(); } + + public ContainerBuilder force() { + Builder.this.force(); + return this; + } } } 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 c40d6b8518..101e03dedb 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 @@ -87,6 +87,9 @@ public class TermsAggregation extends BucketAggregationBase implements Aggregati private final List> order; + @Nullable + private final SortOrder sortOrder; + @Nullable private final Script script; @@ -123,6 +126,7 @@ private TermsAggregation(Builder builder) { this.showTermDocCountError = builder.showTermDocCountError; this.size = builder.size; this.format = builder.format; + this.sortOrder = builder.sortOrder; } @@ -241,6 +245,11 @@ public final Script script() { return this.script; } + @Nullable + public final SortOrder sortOrder(){ + return this.sortOrder; + } + /** * API name: {@code shard_size} */ @@ -336,6 +345,12 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { generator.writeEnd(); } + + if(this.sortOrder != null){ + generator.writeKey("order"); + this.sortOrder.serialize(generator, mapper); + } + if (this.script != null) { generator.writeKey("script"); this.script.serialize(generator, mapper); @@ -406,6 +421,9 @@ public static class Builder extends BucketAggregationBase.AbstractBuilder> order; + @Nullable + private SortOrder sortOrder; + @Nullable private Script script; @@ -574,6 +592,11 @@ public final Builder order(NamedValue value, NamedValue... return this; } + public final Builder sortOrder(SortOrder sortOrder){ + this.sortOrder = sortOrder; + return this; + } + /** * API name: {@code script} */ diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Query.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Query.java index 74fd1308e9..f8ed508b2b 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Query.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Query.java @@ -1796,6 +1796,10 @@ public Query build() { return new Query(this); } + public ObjectBuilder force(){ + _force(); + return this; + } } protected static void setupQueryDeserializer(ObjectDeserializer op) { diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/QueryBase.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/QueryBase.java index 5c6f83e1b0..6ecb53f19b 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/QueryBase.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/QueryBase.java @@ -132,6 +132,11 @@ public final BuilderT queryName(@Nullable String value) { return self(); } + public final BuilderT force() { + _force(); + return self(); + } + protected abstract BuilderT self(); } diff --git a/java-client/src/main/java/co/elastic/clients/util/ObjectBuilderBase.java b/java-client/src/main/java/co/elastic/clients/util/ObjectBuilderBase.java index e61462418a..d210ed54a1 100644 --- a/java-client/src/main/java/co/elastic/clients/util/ObjectBuilderBase.java +++ b/java-client/src/main/java/co/elastic/clients/util/ObjectBuilderBase.java @@ -40,6 +40,10 @@ protected void _checkSingleUse() { this._used = true; } + protected void _force() { + this._used = false; + } + //----- List utilities /** A private extension of ArrayList so that we can recognize our own creations */ diff --git a/java-client/src/main/java/co/elastic/clients/util/WithJsonObjectBuilderBase.java b/java-client/src/main/java/co/elastic/clients/util/WithJsonObjectBuilderBase.java index fc40dc3dcb..3b4ca97629 100644 --- a/java-client/src/main/java/co/elastic/clients/util/WithJsonObjectBuilderBase.java +++ b/java-client/src/main/java/co/elastic/clients/util/WithJsonObjectBuilderBase.java @@ -36,7 +36,6 @@ * the mapper has a deserializer attribute for that generic parameter's name. */ public abstract class WithJsonObjectBuilderBase extends ObjectBuilderBase implements WithJson { - protected abstract B self(); @Override