Skip to content

path/query params lists exclude null from json ser #1222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
l-trotta merged 1 commit into from
Apr 28, 2026
Merged

path/query params lists exclude null from json ser #1222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4366,8 +4366,8 @@ public final CompletableFuture<RankEvalResponse> rankEval(
* cluster. If reindexing from a remote cluster into an Elastic Cloud Serverless
* project, only remote hosts from <a href=
* "https://cloud.elastic.co/registration?page=docs&amp;placement=docs-body">Elastic
* Cloud Hosted and Elastic Cloud Serverless</a> are allowed. Automatic data
* stream creation requires a matching index template with data stream enabled.
* Cloud Hosted</a> are allowed. Automatic data stream creation requires a
* matching index template with data stream enabled.
* <p>
* The <code>dest</code> element can be configured like the index API to control
* optimistic concurrency control. Omitting <code>version_type</code> or setting
Expand Down Expand Up @@ -4463,8 +4463,8 @@ public CompletableFuture<ReindexResponse> reindex(ReindexRequest request) {
* cluster. If reindexing from a remote cluster into an Elastic Cloud Serverless
* project, only remote hosts from <a href=
* "https://cloud.elastic.co/registration?page=docs&amp;placement=docs-body">Elastic
* Cloud Hosted and Elastic Cloud Serverless</a> are allowed. Automatic data
* stream creation requires a matching index template with data stream enabled.
* Cloud Hosted</a> are allowed. Automatic data stream creation requires a
* matching index template with data stream enabled.
* <p>
* The <code>dest</code> element can be configured like the index API to control
* optimistic concurrency control. Omitting <code>version_type</code> or setting
Expand Down
8 changes: 4 additions & 4 deletions java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4398,8 +4398,8 @@ public final RankEvalResponse rankEval(Function<RankEvalRequest.Builder, ObjectB
* cluster. If reindexing from a remote cluster into an Elastic Cloud Serverless
* project, only remote hosts from <a href=
* "https://cloud.elastic.co/registration?page=docs&amp;placement=docs-body">Elastic
* Cloud Hosted and Elastic Cloud Serverless</a> are allowed. Automatic data
* stream creation requires a matching index template with data stream enabled.
* Cloud Hosted</a> are allowed. Automatic data stream creation requires a
* matching index template with data stream enabled.
* <p>
* The <code>dest</code> element can be configured like the index API to control
* optimistic concurrency control. Omitting <code>version_type</code> or setting
Expand Down Expand Up @@ -4495,8 +4495,8 @@ public ReindexResponse reindex(ReindexRequest request) throws IOException, Elast
* cluster. If reindexing from a remote cluster into an Elastic Cloud Serverless
* project, only remote hosts from <a href=
* "https://cloud.elastic.co/registration?page=docs&amp;placement=docs-body">Elastic
* Cloud Hosted and Elastic Cloud Serverless</a> are allowed. Automatic data
* stream creation requires a matching index template with data stream enabled.
* Cloud Hosted</a> are allowed. Automatic data stream creation requires a
* matching index template with data stream enabled.
* <p>
* The <code>dest</code> element can be configured like the index API to control
* optimistic concurrency control. Omitting <code>version_type</code> or setting
Expand Down
2 changes: 1 addition & 1 deletion ...lient/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/BucketsPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ private BucketsPath(Kind kind, Object value) {
public String _toJsonString() {
switch (_kind) {
case Array :
return this.array().stream().map(v -> v).collect(Collectors.joining(","));
return this.array().stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(","));
case Dict :
return this.dict().entrySet().stream().map(e -> e.getKey() + ":" + e.getValue())
.collect(Collectors.joining(","));
Expand Down
2 changes: 1 addition & 1 deletion ...ient/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsExclude.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ private TermsExclude(Kind kind, Object value) {
public String _toJsonString() {
switch (_kind) {
case Terms :
return this.terms().stream().map(v -> v).collect(Collectors.joining(","));
return this.terms().stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(","));
case Regexp :
return this.regexp();

Expand Down
13 changes: 8 additions & 5 deletions java-client/src/main/java/co/elastic/clients/elasticsearch/async_search/SubmitRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2585,7 +2585,8 @@ protected static void setupSubmitRequestDeserializer(ObjectDeserializer<SubmitRe
if (propsSet == (_index)) {
StringBuilder buf = new StringBuilder();
buf.append("/");
SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull)
.collect(Collectors.joining(",")), buf);
buf.append("/_async_search");
return buf.toString();
}
Expand All @@ -2606,7 +2607,8 @@ protected static void setupSubmitRequestDeserializer(ObjectDeserializer<SubmitRe
if (propsSet == 0) {
}
if (propsSet == (_index)) {
params.put("index", request.index.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull)
.collect(Collectors.joining(",")));
}
return params;
},
Expand All @@ -2622,7 +2624,8 @@ protected static void setupSubmitRequestDeserializer(ObjectDeserializer<SubmitRe
params.put("lenient", String.valueOf(request.lenient));
}
if (ApiTypeHelper.isDefined(request.routing)) {
params.put("routing", request.routing.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("routing", request.routing.stream().map(v -> v).filter(Objects::nonNull)
.collect(Collectors.joining(",")));
}
if (request.ignoreUnavailable != null) {
params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
Expand All @@ -2646,8 +2649,8 @@ protected static void setupSubmitRequestDeserializer(ObjectDeserializer<SubmitRe
params.put("allow_partial_search_results", String.valueOf(request.allowPartialSearchResults));
}
if (ApiTypeHelper.isDefined(request.expandWildcards)) {
params.put("expand_wildcards",
request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue())
.filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.preference != null) {
params.put("preference", request.preference);
Expand Down
17 changes: 11 additions & 6 deletions java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AliasesRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,9 @@ public Builder rebuild() {
buf.append("/_cat");
buf.append("/aliases");
buf.append("/");
SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
SimpleEndpoint.pathEncode(
request.name.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")),
buf);
return buf.toString();
}
throw SimpleEndpoint.noPathTemplateFound("path");
Expand All @@ -506,7 +508,8 @@ public Builder rebuild() {
if (propsSet == 0) {
}
if (propsSet == (_name)) {
params.put("name", request.name.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("name", request.name.stream().map(v -> v).filter(Objects::nonNull)
.collect(Collectors.joining(",")));
}
return params;
},
Expand All @@ -519,17 +522,19 @@ public Builder rebuild() {
params.put("master_timeout", request.masterTimeout._toJsonString());
}
if (ApiTypeHelper.isDefined(request.s)) {
params.put("s", request.s.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("s",
request.s.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (ApiTypeHelper.isDefined(request.expandWildcards)) {
params.put("expand_wildcards",
request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue())
.filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.bytes != null) {
params.put("bytes", request.bytes.jsonValue());
}
if (ApiTypeHelper.isDefined(request.h)) {
params.put("h", request.h.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("h",
request.h.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.time != null) {
params.put("time", request.time.jsonValue());
Expand Down
13 changes: 8 additions & 5 deletions java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AllocationRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,8 +460,8 @@ public Builder rebuild() {
buf.append("/_cat");
buf.append("/allocation");
buf.append("/");
SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")),
buf);
SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).filter(Objects::nonNull)
.collect(Collectors.joining(",")), buf);
return buf.toString();
}
throw SimpleEndpoint.noPathTemplateFound("path");
Expand All @@ -481,7 +481,8 @@ public Builder rebuild() {
if (propsSet == 0) {
}
if (propsSet == (_nodeId)) {
params.put("nodeId", request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("nodeId", request.nodeId.stream().map(v -> v).filter(Objects::nonNull)
.collect(Collectors.joining(",")));
}
return params;
},
Expand All @@ -494,13 +495,15 @@ public Builder rebuild() {
params.put("master_timeout", request.masterTimeout._toJsonString());
}
if (ApiTypeHelper.isDefined(request.s)) {
params.put("s", request.s.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("s",
request.s.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.bytes != null) {
params.put("bytes", request.bytes.jsonValue());
}
if (ApiTypeHelper.isDefined(request.h)) {
params.put("h", request.h.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("h",
request.h.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.time != null) {
params.put("time", request.time.jsonValue());
Expand Down
6 changes: 4 additions & 2 deletions ...-client/src/main/java/co/elastic/clients/elasticsearch/cat/ComponentTemplatesRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,13 +482,15 @@ public Builder rebuild() {
params.put("master_timeout", request.masterTimeout._toJsonString());
}
if (ApiTypeHelper.isDefined(request.s)) {
params.put("s", request.s.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("s",
request.s.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.bytes != null) {
params.put("bytes", request.bytes.jsonValue());
}
if (ApiTypeHelper.isDefined(request.h)) {
params.put("h", request.h.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("h",
request.h.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.time != null) {
params.put("time", request.time.jsonValue());
Expand Down
12 changes: 8 additions & 4 deletions java-client/src/main/java/co/elastic/clients/elasticsearch/cat/CountRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,8 @@ protected static void setupCountRequestDeserializer(ObjectDeserializer<CountRequ
buf.append("/_cat");
buf.append("/count");
buf.append("/");
SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull)
.collect(Collectors.joining(",")), buf);
return buf.toString();
}
throw SimpleEndpoint.noPathTemplateFound("path");
Expand All @@ -484,7 +485,8 @@ protected static void setupCountRequestDeserializer(ObjectDeserializer<CountRequ
if (propsSet == 0) {
}
if (propsSet == (_index)) {
params.put("index", request.index.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull)
.collect(Collectors.joining(",")));
}
return params;
},
Expand All @@ -494,13 +496,15 @@ protected static void setupCountRequestDeserializer(ObjectDeserializer<CountRequ
Map<String, String> params = new HashMap<>();
params.put("format", "json");
if (ApiTypeHelper.isDefined(request.s)) {
params.put("s", request.s.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("s",
request.s.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.bytes != null) {
params.put("bytes", request.bytes.jsonValue());
}
if (ApiTypeHelper.isDefined(request.h)) {
params.put("h", request.h.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("h",
request.h.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.time != null) {
params.put("time", request.time.jsonValue());
Expand Down
13 changes: 8 additions & 5 deletions java-client/src/main/java/co/elastic/clients/elasticsearch/cat/FielddataRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,8 @@ public Builder rebuild() {
buf.append("/_cat");
buf.append("/fielddata");
buf.append("/");
SimpleEndpoint.pathEncode(request.fields.stream().map(v -> v).collect(Collectors.joining(",")),
buf);
SimpleEndpoint.pathEncode(request.fields.stream().map(v -> v).filter(Objects::nonNull)
.collect(Collectors.joining(",")), buf);
return buf.toString();
}
throw SimpleEndpoint.noPathTemplateFound("path");
Expand All @@ -407,7 +407,8 @@ public Builder rebuild() {
if (propsSet == 0) {
}
if (propsSet == (_fields)) {
params.put("fields", request.fields.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("fields", request.fields.stream().map(v -> v).filter(Objects::nonNull)
.collect(Collectors.joining(",")));
}
return params;
},
Expand All @@ -417,13 +418,15 @@ public Builder rebuild() {
Map<String, String> params = new HashMap<>();
params.put("format", "json");
if (ApiTypeHelper.isDefined(request.s)) {
params.put("s", request.s.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("s",
request.s.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.bytes != null) {
params.put("bytes", request.bytes.jsonValue());
}
if (ApiTypeHelper.isDefined(request.h)) {
params.put("h", request.h.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("h",
request.h.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.time != null) {
params.put("time", request.time.jsonValue());
Expand Down
6 changes: 4 additions & 2 deletions java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HealthRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,13 +374,15 @@ public Builder rebuild() {
Map<String, String> params = new HashMap<>();
params.put("format", "json");
if (ApiTypeHelper.isDefined(request.s)) {
params.put("s", request.s.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("s",
request.s.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.bytes != null) {
params.put("bytes", request.bytes.jsonValue());
}
if (ApiTypeHelper.isDefined(request.h)) {
params.put("h", request.h.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("h",
request.h.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.time != null) {
params.put("time", request.time.jsonValue());
Expand Down
16 changes: 10 additions & 6 deletions java-client/src/main/java/co/elastic/clients/elasticsearch/cat/IndicesRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,8 @@ public Builder rebuild() {
buf.append("/_cat");
buf.append("/indices");
buf.append("/");
SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull)
.collect(Collectors.joining(",")), buf);
return buf.toString();
}
throw SimpleEndpoint.noPathTemplateFound("path");
Expand All @@ -604,7 +605,8 @@ public Builder rebuild() {
if (propsSet == 0) {
}
if (propsSet == (_index)) {
params.put("index", request.index.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull)
.collect(Collectors.joining(",")));
}
return params;
},
Expand All @@ -617,11 +619,12 @@ public Builder rebuild() {
params.put("master_timeout", request.masterTimeout._toJsonString());
}
if (ApiTypeHelper.isDefined(request.s)) {
params.put("s", request.s.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("s",
request.s.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (ApiTypeHelper.isDefined(request.expandWildcards)) {
params.put("expand_wildcards",
request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue())
.filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.pri != null) {
params.put("pri", String.valueOf(request.pri));
Expand All @@ -630,7 +633,8 @@ public Builder rebuild() {
params.put("bytes", request.bytes.jsonValue());
}
if (ApiTypeHelper.isDefined(request.h)) {
params.put("h", request.h.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("h",
request.h.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.health != null) {
params.put("health", request.health.jsonValue());
Expand Down
6 changes: 4 additions & 2 deletions java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MasterRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,13 +418,15 @@ public Builder rebuild() {
params.put("master_timeout", request.masterTimeout._toJsonString());
}
if (ApiTypeHelper.isDefined(request.s)) {
params.put("s", request.s.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("s",
request.s.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.bytes != null) {
params.put("bytes", request.bytes.jsonValue());
}
if (ApiTypeHelper.isDefined(request.h)) {
params.put("h", request.h.stream().map(v -> v).collect(Collectors.joining(",")));
params.put("h",
request.h.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")));
}
if (request.time != null) {
params.put("time", request.time.jsonValue());
Expand Down
6 changes: 4 additions & 2 deletions ...lient/src/main/java/co/elastic/clients/elasticsearch/cat/MlDataFrameAnalyticsRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,13 +416,15 @@ public Builder rebuild() {
Map<String, String> params = new HashMap<>();
params.put("format", "json");
if (ApiTypeHelper.isDefined(request.s)) {
params.put("s", request.s.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
params.put("s", request.s.stream().map(v -> v.jsonValue()).filter(Objects::nonNull)
.collect(Collectors.joining(",")));
}
if (request.bytes != null) {
params.put("bytes", request.bytes.jsonValue());
}
if (ApiTypeHelper.isDefined(request.h)) {
params.put("h", request.h.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
params.put("h", request.h.stream().map(v -> v.jsonValue()).filter(Objects::nonNull)
.collect(Collectors.joining(",")));
}
if (request.time != null) {
params.put("time", request.time.jsonValue());
Expand Down
6 changes: 4 additions & 2 deletions java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlDatafeedsRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,13 +436,15 @@ public Builder rebuild() {
Map<String, String> params = new HashMap<>();
params.put("format", "json");
if (ApiTypeHelper.isDefined(request.s)) {
params.put("s", request.s.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
params.put("s", request.s.stream().map(v -> v.jsonValue()).filter(Objects::nonNull)
.collect(Collectors.joining(",")));
}
if (request.bytes != null) {
params.put("bytes", request.bytes.jsonValue());
}
if (ApiTypeHelper.isDefined(request.h)) {
params.put("h", request.h.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
params.put("h", request.h.stream().map(v -> v.jsonValue()).filter(Objects::nonNull)
.collect(Collectors.joining(",")));
}
if (request.time != null) {
params.put("time", request.time.jsonValue());
Expand Down
Loading
Loading