From 51d9c5644b1ac848c108f6050c135e1b37d73e05 Mon Sep 17 00:00:00 2001 From: Laura Trotta Date: Tue, 28 Apr 2026 11:54:43 +0200 Subject: [PATCH] path/query params exclude null from json ser --- .../ElasticsearchAsyncClient.java | 8 +- .../elasticsearch/ElasticsearchClient.java | 8 +- .../_types/aggregations/BucketsPath.java | 2 +- .../_types/aggregations/TermsExclude.java | 2 +- .../async_search/SubmitRequest.java | 13 +- .../elasticsearch/cat/AliasesRequest.java | 17 +- .../elasticsearch/cat/AllocationRequest.java | 13 +- .../cat/ComponentTemplatesRequest.java | 6 +- .../elasticsearch/cat/CountRequest.java | 12 +- .../elasticsearch/cat/FielddataRequest.java | 13 +- .../elasticsearch/cat/HealthRequest.java | 6 +- .../elasticsearch/cat/IndicesRequest.java | 16 +- .../elasticsearch/cat/MasterRequest.java | 6 +- .../cat/MlDataFrameAnalyticsRequest.java | 6 +- .../elasticsearch/cat/MlDatafeedsRequest.java | 6 +- .../elasticsearch/cat/MlJobsRequest.java | 6 +- .../cat/MlTrainedModelsRequest.java | 6 +- .../elasticsearch/cat/NodeattrsRequest.java | 6 +- .../elasticsearch/cat/NodesRequest.java | 6 +- .../cat/PendingTasksRequest.java | 6 +- .../elasticsearch/cat/PluginsRequest.java | 6 +- .../elasticsearch/cat/RecoveryRequest.java | 12 +- .../cat/RepositoriesRequest.java | 6 +- .../elasticsearch/cat/SegmentsRequest.java | 16 +- .../elasticsearch/cat/ShardsRequest.java | 12 +- .../elasticsearch/cat/SnapshotsRequest.java | 13 +- .../elasticsearch/cat/TasksRequest.java | 12 +- .../elasticsearch/cat/TemplatesRequest.java | 6 +- .../elasticsearch/cat/ThreadPoolRequest.java | 14 +- .../elasticsearch/cat/TransformsRequest.java | 6 +- .../elasticsearch/ccr/FollowInfoRequest.java | 6 +- .../elasticsearch/ccr/FollowStatsRequest.java | 6 +- .../cluster/ClusterInfoRequest.java | 8 +- .../cluster/ClusterStatsRequest.java | 7 +- .../DeleteComponentTemplateRequest.java | 7 +- .../ExistsComponentTemplateRequest.java | 7 +- .../cluster/GetComponentTemplateRequest.java | 4 +- .../elasticsearch/cluster/HealthRequest.java | 10 +- .../PostVotingConfigExclusionsRequest.java | 6 +- .../elasticsearch/cluster/RerouteRequest.java | 3 +- .../elasticsearch/cluster/StateRequest.java | 26 +-- .../elasticsearch/connector/ListRequest.java | 11 +- .../connector/SyncJobListRequest.java | 4 +- .../elasticsearch/core/BulkRequest.java | 11 +- .../elasticsearch/core/CountRequest.java | 13 +- .../elasticsearch/core/CreateRequest.java | 3 +- .../core/DeleteByQueryRequest.java | 16 +- .../elasticsearch/core/DeleteRequest.java | 3 +- .../elasticsearch/core/ExistsRequest.java | 15 +- .../core/ExistsSourceRequest.java | 11 +- .../elasticsearch/core/ExplainRequest.java | 15 +- .../elasticsearch/core/FieldCapsRequest.java | 16 +- .../elasticsearch/core/GetRequest.java | 15 +- .../elasticsearch/core/GetSourceRequest.java | 11 +- .../core/HealthReportRequest.java | 7 +- .../elasticsearch/core/IndexRequest.java | 3 +- .../elasticsearch/core/MgetRequest.java | 15 +- .../elasticsearch/core/MsearchRequest.java | 13 +- .../core/MsearchTemplateRequest.java | 6 +- .../core/MtermvectorsRequest.java | 6 +- .../core/OpenPointInTimeRequest.java | 13 +- .../elasticsearch/core/RankEvalRequest.java | 10 +- .../elasticsearch/core/ReindexRequest.java | 4 +- .../elasticsearch/core/SearchMvtRequest.java | 6 +- .../elasticsearch/core/SearchRequest.java | 13 +- .../core/SearchShardsRequest.java | 13 +- .../core/SearchTemplateRequest.java | 13 +- .../elasticsearch/core/TermsEnumRequest.java | 6 +- .../core/UpdateByQueryRequest.java | 19 +- .../elasticsearch/core/UpdateRequest.java | 3 +- .../core/search/SourceConfigParam.java | 2 +- .../elasticsearch/doc-files/api-spec.html | 200 +++++++++--------- .../enrich/GetPolicyRequest.java | 7 +- .../elasticsearch/eql/EqlSearchRequest.java | 10 +- .../fleet/FleetSearchRequest.java | 9 +- .../elasticsearch/graph/ExploreRequest.java | 9 +- .../indices/AddBlockRequest.java | 10 +- .../indices/CancelMigrateReindexRequest.java | 6 +- .../indices/ClearCacheRequest.java | 13 +- .../indices/CloseIndexRequest.java | 10 +- .../indices/DataStreamsStatsRequest.java | 11 +- .../indices/DeleteAliasRequest.java | 26 ++- .../indices/DeleteDataLifecycleRequest.java | 11 +- .../DeleteDataStreamOptionsRequest.java | 11 +- .../indices/DeleteDataStreamRequest.java | 11 +- .../indices/DeleteIndexRequest.java | 10 +- .../indices/DeleteIndexTemplateRequest.java | 7 +- .../indices/DiskUsageRequest.java | 10 +- .../indices/ExistsAliasRequest.java | 24 ++- .../elasticsearch/indices/ExistsRequest.java | 10 +- .../indices/ExistsTemplateRequest.java | 7 +- .../indices/ExplainDataLifecycleRequest.java | 6 +- .../indices/FieldUsageStatsRequest.java | 13 +- .../elasticsearch/indices/FlushRequest.java | 10 +- .../indices/ForcemergeRequest.java | 10 +- .../indices/GetAliasRequest.java | 30 ++- .../indices/GetDataLifecycleRequest.java | 11 +- .../indices/GetDataStreamMappingsRequest.java | 7 +- .../indices/GetDataStreamOptionsRequest.java | 11 +- .../indices/GetDataStreamRequest.java | 11 +- .../indices/GetDataStreamSettingsRequest.java | 7 +- .../indices/GetFieldMappingRequest.java | 24 ++- .../indices/GetIndexRequest.java | 14 +- .../indices/GetIndicesSettingsRequest.java | 30 ++- .../indices/GetMappingRequest.java | 10 +- .../GetMigrateReindexStatusRequest.java | 6 +- .../indices/GetTemplateRequest.java | 7 +- .../indices/IndicesStatsRequest.java | 46 ++-- .../elasticsearch/indices/OpenRequest.java | 10 +- .../indices/PutAliasRequest.java | 12 +- .../indices/PutDataLifecycleRequest.java | 11 +- .../indices/PutDataStreamMappingsRequest.java | 7 +- .../indices/PutDataStreamOptionsRequest.java | 11 +- .../indices/PutDataStreamSettingsRequest.java | 7 +- .../indices/PutIndicesSettingsRequest.java | 10 +- .../indices/PutMappingRequest.java | 10 +- .../indices/RecoveryRequest.java | 10 +- .../elasticsearch/indices/RefreshRequest.java | 10 +- .../indices/ReloadSearchAnalyzersRequest.java | 10 +- .../indices/RemoveBlockRequest.java | 10 +- .../indices/ResolveClusterRequest.java | 11 +- .../indices/ResolveIndexRequest.java | 14 +- .../indices/SegmentsRequest.java | 10 +- .../indices/ShardStoresRequest.java | 14 +- .../indices/ValidateQueryRequest.java | 10 +- .../inference/AmazonSageMakerElementType.java | 69 ------ .../AmazonSageMakerServiceSettings.java | 76 ------- .../inference/AmazonSageMakerSimilarity.java | 69 ------ .../ingest/DeleteGeoipDatabaseRequest.java | 7 +- .../DeleteIpLocationDatabaseRequest.java | 7 +- .../ingest/GetGeoipDatabaseRequest.java | 7 +- .../ingest/GetIpLocationDatabaseRequest.java | 7 +- .../logstash/GetPipelineRequest.java | 7 +- .../ml/DeleteCalendarJobRequest.java | 6 +- .../ml/GetDatafeedStatsRequest.java | 7 +- .../elasticsearch/ml/GetDatafeedsRequest.java | 7 +- .../elasticsearch/ml/GetFiltersRequest.java | 7 +- .../elasticsearch/ml/GetJobsRequest.java | 6 +- .../ml/GetTrainedModelsRequest.java | 10 +- .../ml/GetTrainedModelsStatsRequest.java | 7 +- .../ml/PutCalendarJobRequest.java | 6 +- .../elasticsearch/ml/PutDatafeedRequest.java | 4 +- .../elasticsearch/ml/PutJobRequest.java | 4 +- .../ml/UpdateDatafeedRequest.java | 4 +- ...earRepositoriesMeteringArchiveRequest.java | 7 +- .../GetRepositoriesMeteringInfoRequest.java | 7 +- .../nodes/HotThreadsRequest.java | 7 +- .../elasticsearch/nodes/NodesInfoRequest.java | 30 +-- .../nodes/NodesStatsRequest.java | 83 ++++---- .../nodes/NodesUsageRequest.java | 30 +-- .../nodes/ReloadSecureSettingsRequest.java | 7 +- .../rollup/GetRollupIndexCapsRequest.java | 6 +- .../rollup/RollupSearchRequest.java | 6 +- .../GetBehavioralAnalyticsRequest.java | 7 +- .../CacheStatsRequest.java | 7 +- .../ClearCacheRequest.java | 10 +- .../SearchableSnapshotsStatsRequest.java | 6 +- .../security/ClearApiKeyCacheRequest.java | 7 +- .../ClearCachedPrivilegesRequest.java | 8 +- .../security/ClearCachedRealmsRequest.java | 10 +- .../security/ClearCachedRolesRequest.java | 7 +- .../ClearCachedServiceTokensRequest.java | 7 +- .../security/DeletePrivilegesRequest.java | 7 +- .../security/GetPrivilegesRequest.java | 7 +- .../security/GetRoleMappingRequest.java | 7 +- .../security/GetRoleRequest.java | 7 +- .../security/GetUserProfileRequest.java | 10 +- .../security/GetUserRequest.java | 7 +- .../shutdown/GetNodeRequest.java | 7 +- .../slm/GetLifecycleRequest.java | 7 +- .../snapshot/DeleteRepositoryRequest.java | 7 +- .../snapshot/DeleteSnapshotRequest.java | 7 +- .../snapshot/GetRepositoryRequest.java | 7 +- .../snapshot/GetSnapshotRequest.java | 11 +- .../snapshot/RepositoryAnalyzeRequest.java | 67 ++---- .../RepositoryVerifyIntegrityRequest.java | 7 +- .../snapshot/SnapshotStatusRequest.java | 7 +- .../elasticsearch/tasks/CancelRequest.java | 6 +- .../elasticsearch/tasks/ListRequest.java | 6 +- .../FindFieldStructureRequest.java | 4 +- .../FindMessageStructureRequest.java | 4 +- .../transform/GetTransformRequest.java | 8 +- .../transform/GetTransformStatsRequest.java | 8 +- .../elasticsearch/transform/Settings.java | 8 +- .../watcher/AckWatchRequest.java | 7 +- .../watcher/WatcherStatsRequest.java | 8 +- .../elasticsearch/xpack/XpackInfoRequest.java | 4 +- 187 files changed, 1227 insertions(+), 1072 deletions(-) delete mode 100644 java-client/src/main/java/co/elastic/clients/elasticsearch/inference/AmazonSageMakerElementType.java delete mode 100644 java-client/src/main/java/co/elastic/clients/elasticsearch/inference/AmazonSageMakerSimilarity.java diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchAsyncClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchAsyncClient.java index ff327def1f..3a5e474e59 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchAsyncClient.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchAsyncClient.java @@ -4366,8 +4366,8 @@ public final CompletableFuture rankEval( * cluster. If reindexing from a remote cluster into an Elastic Cloud Serverless * project, only remote hosts from Elastic - * Cloud Hosted and Elastic Cloud Serverless are allowed. Automatic data - * stream creation requires a matching index template with data stream enabled. + * Cloud Hosted are allowed. Automatic data stream creation requires a + * matching index template with data stream enabled. *

* The dest element can be configured like the index API to control * optimistic concurrency control. Omitting version_type or setting @@ -4463,8 +4463,8 @@ public CompletableFuture reindex(ReindexRequest request) { * cluster. If reindexing from a remote cluster into an Elastic Cloud Serverless * project, only remote hosts from Elastic - * Cloud Hosted and Elastic Cloud Serverless are allowed. Automatic data - * stream creation requires a matching index template with data stream enabled. + * Cloud Hosted are allowed. Automatic data stream creation requires a + * matching index template with data stream enabled. *

* The dest element can be configured like the index API to control * optimistic concurrency control. Omitting version_type or setting diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchClient.java index d61f3cb2ff..1ee17a7cad 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchClient.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchClient.java @@ -4398,8 +4398,8 @@ public final RankEvalResponse rankEval(FunctionElastic - * Cloud Hosted and Elastic Cloud Serverless are allowed. Automatic data - * stream creation requires a matching index template with data stream enabled. + * Cloud Hosted are allowed. Automatic data stream creation requires a + * matching index template with data stream enabled. *

* The dest element can be configured like the index API to control * optimistic concurrency control. Omitting version_type or setting @@ -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 Elastic - * Cloud Hosted and Elastic Cloud Serverless are allowed. Automatic data - * stream creation requires a matching index template with data stream enabled. + * Cloud Hosted are allowed. Automatic data stream creation requires a + * matching index template with data stream enabled. *

* The dest element can be configured like the index API to control * optimistic concurrency control. Omitting version_type or setting diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/BucketsPath.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/BucketsPath.java index b2a928dc44..52c7d6f8db 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/BucketsPath.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/BucketsPath.java @@ -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(",")); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsExclude.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsExclude.java index 35dd9f9624..32dc0f0622 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsExclude.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsExclude.java @@ -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(); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/async_search/SubmitRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/async_search/SubmitRequest.java index 7714c217b2..cbc6fa49f6 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/async_search/SubmitRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/async_search/SubmitRequest.java @@ -2585,7 +2585,8 @@ protected static void setupSubmitRequestDeserializer(ObjectDeserializer 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(); } @@ -2606,7 +2607,8 @@ protected static void setupSubmitRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -2622,7 +2624,8 @@ protected static void setupSubmitRequestDeserializer(ObjectDeserializer 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)); @@ -2646,8 +2649,8 @@ protected static void setupSubmitRequestDeserializer(ObjectDeserializer 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); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AliasesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AliasesRequest.java index e658fd8788..f56aad44b4 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AliasesRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AliasesRequest.java @@ -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"); @@ -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; }, @@ -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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AllocationRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AllocationRequest.java index cbdab20869..a43d632109 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AllocationRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AllocationRequest.java @@ -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"); @@ -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; }, @@ -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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ComponentTemplatesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ComponentTemplatesRequest.java index 0f76695606..d9c0401b22 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ComponentTemplatesRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ComponentTemplatesRequest.java @@ -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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/CountRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/CountRequest.java index 165aa82337..615825b88c 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/CountRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/CountRequest.java @@ -464,7 +464,8 @@ protected static void setupCountRequestDeserializer(ObjectDeserializer 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"); @@ -484,7 +485,8 @@ protected static void setupCountRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -494,13 +496,15 @@ protected static void setupCountRequestDeserializer(ObjectDeserializer 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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/FielddataRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/FielddataRequest.java index 0ff2d97b38..0c11474b55 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/FielddataRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/FielddataRequest.java @@ -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"); @@ -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; }, @@ -417,13 +418,15 @@ public Builder rebuild() { Map 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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HealthRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HealthRequest.java index 1af3304bd6..9b5d3500e1 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HealthRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HealthRequest.java @@ -374,13 +374,15 @@ public Builder rebuild() { Map 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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/IndicesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/IndicesRequest.java index 34f5663ea8..ac7b459ce6 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/IndicesRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/IndicesRequest.java @@ -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"); @@ -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; }, @@ -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)); @@ -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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MasterRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MasterRequest.java index 13bf86db34..0b6c988412 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MasterRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MasterRequest.java @@ -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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlDataFrameAnalyticsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlDataFrameAnalyticsRequest.java index 736855c62a..b259dd8dc9 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlDataFrameAnalyticsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlDataFrameAnalyticsRequest.java @@ -416,13 +416,15 @@ public Builder rebuild() { Map 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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlDatafeedsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlDatafeedsRequest.java index 66057956c3..c6279ec438 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlDatafeedsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlDatafeedsRequest.java @@ -436,13 +436,15 @@ public Builder rebuild() { Map 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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlJobsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlJobsRequest.java index eeed16c3f3..dfc58ca79c 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlJobsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlJobsRequest.java @@ -436,13 +436,15 @@ public Builder rebuild() { Map 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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlTrainedModelsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlTrainedModelsRequest.java index 7ac53466e3..9af7b45237 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlTrainedModelsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlTrainedModelsRequest.java @@ -476,7 +476,8 @@ public Builder rebuild() { Map 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.size != null) { params.put("size", String.valueOf(request.size)); @@ -485,7 +486,8 @@ public Builder rebuild() { 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.from != null) { params.put("from", String.valueOf(request.from)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodeattrsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodeattrsRequest.java index 8119ce3d9a..3e86f894cb 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodeattrsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodeattrsRequest.java @@ -416,13 +416,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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodesRequest.java index 4e8ff804aa..421860c56c 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodesRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodesRequest.java @@ -438,13 +438,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.includeUnloadedSegments != null) { params.put("include_unloaded_segments", String.valueOf(request.includeUnloadedSegments)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PendingTasksRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PendingTasksRequest.java index 61b71d0af6..eb76c405f5 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PendingTasksRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PendingTasksRequest.java @@ -416,13 +416,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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PluginsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PluginsRequest.java index 8afb1f20c9..4b779e5c5d 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PluginsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PluginsRequest.java @@ -444,13 +444,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.includeBootstrap != null) { params.put("include_bootstrap", String.valueOf(request.includeBootstrap)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RecoveryRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RecoveryRequest.java index b12bb27845..5678c9b78d 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RecoveryRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RecoveryRequest.java @@ -450,7 +450,8 @@ public Builder rebuild() { buf.append("/_cat"); buf.append("/recovery"); 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"); @@ -470,7 +471,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; }, @@ -480,7 +482,8 @@ public Builder rebuild() { Map 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.detailed != null) { params.put("detailed", String.valueOf(request.detailed)); @@ -492,7 +495,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.time != null) { params.put("time", request.time.jsonValue()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RepositoriesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RepositoriesRequest.java index f7b1d8a847..e55abf808c 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RepositoriesRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RepositoriesRequest.java @@ -398,13 +398,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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SegmentsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SegmentsRequest.java index c5bd684841..83c8950024 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SegmentsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SegmentsRequest.java @@ -644,7 +644,8 @@ public Builder rebuild() { buf.append("/_cat"); buf.append("/segments"); 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"); @@ -664,7 +665,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; }, @@ -677,11 +679,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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); @@ -696,7 +699,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.ignoreThrottled != null) { params.put("ignore_throttled", String.valueOf(request.ignoreThrottled)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ShardsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ShardsRequest.java index 8bc07bef9f..ded8bd1f88 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ShardsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ShardsRequest.java @@ -421,7 +421,8 @@ public Builder rebuild() { buf.append("/_cat"); buf.append("/shards"); 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"); @@ -441,7 +442,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; }, @@ -454,13 +456,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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SnapshotsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SnapshotsRequest.java index 0ad66036bb..523bc1d86e 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SnapshotsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SnapshotsRequest.java @@ -457,8 +457,8 @@ public Builder rebuild() { buf.append("/_cat"); buf.append("/snapshots"); buf.append("/"); - SimpleEndpoint.pathEncode(request.repository.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.repository.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -478,7 +478,8 @@ public Builder rebuild() { if (propsSet == 0) { } if (propsSet == (_repository)) { - params.put("repository", request.repository.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("repository", request.repository.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -491,7 +492,8 @@ 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); @@ -500,7 +502,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.time != null) { params.put("time", request.time.jsonValue()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TasksRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TasksRequest.java index e1796f2715..06a3ce6f9e 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TasksRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TasksRequest.java @@ -544,13 +544,15 @@ public Builder rebuild() { Map params = new HashMap<>(); params.put("format", "json"); if (ApiTypeHelper.isDefined(request.nodes)) { - params.put("nodes", request.nodes.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("nodes", request.nodes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.parentTaskId != null) { params.put("parent_task_id", request.parentTaskId); } 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.detailed != null) { params.put("detailed", String.valueOf(request.detailed)); @@ -559,13 +561,15 @@ 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.time != null) { params.put("time", request.time.jsonValue()); } if (ApiTypeHelper.isDefined(request.actions)) { - params.put("actions", request.actions.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("actions", request.actions.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.waitForCompletion != null) { params.put("wait_for_completion", String.valueOf(request.waitForCompletion)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TemplatesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TemplatesRequest.java index b69c1f11fb..ec1f815966 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TemplatesRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TemplatesRequest.java @@ -480,13 +480,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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ThreadPoolRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ThreadPoolRequest.java index c112bfef44..27beb1ccd0 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ThreadPoolRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ThreadPoolRequest.java @@ -456,8 +456,8 @@ public Builder rebuild() { buf.append("/_cat"); buf.append("/thread_pool"); buf.append("/"); - SimpleEndpoint.pathEncode( - request.threadPoolPatterns.stream().map(v -> v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.threadPoolPatterns.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -477,8 +477,8 @@ public Builder rebuild() { if (propsSet == 0) { } if (propsSet == (_threadPoolPatterns)) { - params.put("threadPoolPatterns", - request.threadPoolPatterns.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("threadPoolPatterns", request.threadPoolPatterns.stream().map(v -> v) + .filter(Objects::nonNull).collect(Collectors.joining(","))); } return params; }, @@ -491,13 +491,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()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TransformsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TransformsRequest.java index c2311fce9e..b46994651a 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TransformsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TransformsRequest.java @@ -479,7 +479,8 @@ public Builder rebuild() { Map 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.size != null) { params.put("size", String.valueOf(request.size)); @@ -488,7 +489,8 @@ public Builder rebuild() { 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.from != null) { params.put("from", String.valueOf(request.from)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/FollowInfoRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/FollowInfoRequest.java index c40d9f1007..807bb04dcd 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/FollowInfoRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/FollowInfoRequest.java @@ -228,7 +228,8 @@ public Builder rebuild() { 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("/_ccr"); buf.append("/info"); return buf.toString(); @@ -247,7 +248,8 @@ public Builder rebuild() { propsSet |= _index; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/FollowStatsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/FollowStatsRequest.java index 7e384c6220..52f4f682ce 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/FollowStatsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/FollowStatsRequest.java @@ -222,7 +222,8 @@ public Builder rebuild() { 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("/_ccr"); buf.append("/stats"); return buf.toString(); @@ -241,7 +242,8 @@ public Builder rebuild() { propsSet |= _index; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/ClusterInfoRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/ClusterInfoRequest.java index 0d90f991ac..e8e8f18cd4 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/ClusterInfoRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/ClusterInfoRequest.java @@ -184,8 +184,8 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_info"); buf.append("/"); - SimpleEndpoint.pathEncode( - request.target.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.target.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -202,8 +202,8 @@ public Builder rebuild() { propsSet |= _target; if (propsSet == (_target)) { - params.put("target", - request.target.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("target", request.target.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/ClusterStatsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/ClusterStatsRequest.java index 06ad0f5109..e52e3ed3fe 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/ClusterStatsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/ClusterStatsRequest.java @@ -271,8 +271,8 @@ public Builder rebuild() { buf.append("/stats"); buf.append("/nodes"); 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"); @@ -292,7 +292,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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/DeleteComponentTemplateRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/DeleteComponentTemplateRequest.java index 6456b1f477..05cee07c8c 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/DeleteComponentTemplateRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/DeleteComponentTemplateRequest.java @@ -267,7 +267,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_component_template"); 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"); @@ -284,7 +286,8 @@ public Builder rebuild() { propsSet |= _name; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/ExistsComponentTemplateRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/ExistsComponentTemplateRequest.java index 0c9e06a5cc..8d0fae752b 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/ExistsComponentTemplateRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/ExistsComponentTemplateRequest.java @@ -267,7 +267,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_component_template"); 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"); @@ -284,7 +286,8 @@ public Builder rebuild() { propsSet |= _name; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/GetComponentTemplateRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/GetComponentTemplateRequest.java index 2fbcaad6b7..501c6075f6 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/GetComponentTemplateRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/GetComponentTemplateRequest.java @@ -392,8 +392,8 @@ public Builder rebuild() { params.put("flat_settings", String.valueOf(request.flatSettings)); } if (ApiTypeHelper.isDefined(request.settingsFilter)) { - params.put("settings_filter", - request.settingsFilter.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("settings_filter", request.settingsFilter.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.includeDefaults != null) { params.put("include_defaults", String.valueOf(request.includeDefaults)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/HealthRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/HealthRequest.java index 38230a5495..72457ccef8 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/HealthRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/HealthRequest.java @@ -590,7 +590,8 @@ public Builder rebuild() { buf.append("/_cluster"); buf.append("/health"); 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"); @@ -610,7 +611,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; }, @@ -622,8 +624,8 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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.level != null) { params.put("level", request.level.jsonValue()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/PostVotingConfigExclusionsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/PostVotingConfigExclusionsRequest.java index d179e56561..6a8b2d34d0 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/PostVotingConfigExclusionsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/PostVotingConfigExclusionsRequest.java @@ -356,10 +356,12 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } if (ApiTypeHelper.isDefined(request.nodeNames)) { - params.put("node_names", request.nodeNames.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("node_names", request.nodeNames.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (ApiTypeHelper.isDefined(request.nodeIds)) { - params.put("node_ids", request.nodeIds.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("node_ids", request.nodeIds.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.timeout != null) { params.put("timeout", request.timeout._toJsonString()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/RerouteRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/RerouteRequest.java index 0f382ef520..bfed6bf563 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/RerouteRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/RerouteRequest.java @@ -495,7 +495,8 @@ protected static void setupRerouteRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("metric", request.metric.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.dryRun != null) { params.put("dry_run", String.valueOf(request.dryRun)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/StateRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/StateRequest.java index f71ad1d3f0..34c57c4516 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/StateRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/StateRequest.java @@ -551,8 +551,8 @@ public Builder rebuild() { buf.append("/_cluster"); buf.append("/state"); buf.append("/"); - SimpleEndpoint.pathEncode( - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } if (propsSet == (_metric | _index)) { @@ -560,10 +560,11 @@ public Builder rebuild() { buf.append("/_cluster"); buf.append("/state"); buf.append("/"); - SimpleEndpoint.pathEncode( - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); 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"); @@ -586,13 +587,14 @@ public Builder rebuild() { if (propsSet == 0) { } if (propsSet == (_metric)) { - params.put("metric", - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("metric", request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (propsSet == (_metric | _index)) { - params.put("metric", - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); - params.put("index", request.index.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("metric", request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -607,8 +609,8 @@ public Builder rebuild() { params.put("flat_settings", String.valueOf(request.flatSettings)); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/connector/ListRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/connector/ListRequest.java index 5525850e4a..22bc51f89a 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/connector/ListRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/connector/ListRequest.java @@ -387,8 +387,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); if (ApiTypeHelper.isDefined(request.serviceType)) { - params.put("service_type", - request.serviceType.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("service_type", request.serviceType.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.size != null) { params.put("size", String.valueOf(request.size)); @@ -403,11 +403,12 @@ public Builder rebuild() { params.put("include_deleted", String.valueOf(request.includeDeleted)); } if (ApiTypeHelper.isDefined(request.connectorName)) { - params.put("connector_name", - request.connectorName.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("connector_name", request.connectorName.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (ApiTypeHelper.isDefined(request.indexName)) { - params.put("index_name", request.indexName.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("index_name", request.indexName.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/connector/SyncJobListRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/connector/SyncJobListRequest.java index 640a2b50e0..930da92ec0 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/connector/SyncJobListRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/connector/SyncJobListRequest.java @@ -299,8 +299,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); if (ApiTypeHelper.isDefined(request.jobType)) { - params.put("job_type", - request.jobType.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("job_type", request.jobType.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.size != null) { params.put("size", String.valueOf(request.size)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/BulkRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/BulkRequest.java index 3ceb8956a7..97ae63bc84 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/BulkRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/BulkRequest.java @@ -921,7 +921,8 @@ public Builder rebuild() { params.put("pipeline", request.pipeline); } 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.includeSourceOnError != null) { params.put("include_source_on_error", String.valueOf(request.includeSourceOnError)); @@ -939,12 +940,12 @@ public Builder rebuild() { params.put("_source", request.source._toJsonString()); } if (ApiTypeHelper.isDefined(request.sourceExcludes)) { - params.put("_source_excludes", - request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (ApiTypeHelper.isDefined(request.sourceIncludes)) { - params.put("_source_includes", - request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.requireDataStream != null) { params.put("require_data_stream", String.valueOf(request.requireDataStream)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/CountRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/CountRequest.java index 4f8aeb6a78..88b3bfdb15 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/CountRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/CountRequest.java @@ -824,7 +824,8 @@ protected static void setupCountRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_count"); return buf.toString(); } @@ -845,7 +846,8 @@ protected static void setupCountRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -857,8 +859,8 @@ protected static void setupCountRequestDeserializer(ObjectDeserializer 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); @@ -876,7 +878,8 @@ protected static void setupCountRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("routing", request.routing.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.q != null) { params.put("q", request.q); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/CreateRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/CreateRequest.java index 7a73230e09..1d6338920f 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/CreateRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/CreateRequest.java @@ -818,7 +818,8 @@ public static JsonpDeserializer> createCrea params.put("pipeline", request.pipeline); } 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.includeSourceOnError != null) { params.put("include_source_on_error", String.valueOf(request.includeSourceOnError)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/DeleteByQueryRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/DeleteByQueryRequest.java index bd771e8d84..015f362707 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/DeleteByQueryRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/DeleteByQueryRequest.java @@ -1488,7 +1488,8 @@ protected static void setupDeleteByQueryRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_delete_by_query"); return buf.toString(); } @@ -1506,7 +1507,8 @@ protected static void setupDeleteByQueryRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -1533,7 +1535,8 @@ protected static void setupDeleteByQueryRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("routing", request.routing.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.requestsPerSecond != null) { params.put("requests_per_second", String.valueOf(request.requestsPerSecond)); @@ -1542,7 +1545,8 @@ protected static void setupDeleteByQueryRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("stats", request.stats.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.allowNoIndices != null) { params.put("allow_no_indices", String.valueOf(request.allowNoIndices)); @@ -1557,8 +1561,8 @@ protected static void setupDeleteByQueryRequestDeserializer(ObjectDeserializer 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); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/DeleteRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/DeleteRequest.java index 9a3d1e89bf..40478f467f 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/DeleteRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/DeleteRequest.java @@ -571,7 +571,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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.versionType != null) { params.put("version_type", request.versionType.jsonValue()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ExistsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ExistsRequest.java index 9f0c578394..ee343d2791 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ExistsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ExistsRequest.java @@ -644,7 +644,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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.realtime != null) { params.put("realtime", String.valueOf(request.realtime)); @@ -653,8 +654,8 @@ public Builder rebuild() { params.put("version_type", request.versionType.jsonValue()); } if (ApiTypeHelper.isDefined(request.storedFields)) { - params.put("stored_fields", - request.storedFields.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("stored_fields", request.storedFields.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.preference != null) { params.put("preference", request.preference); @@ -666,12 +667,12 @@ public Builder rebuild() { params.put("_source", request.source._toJsonString()); } if (ApiTypeHelper.isDefined(request.sourceExcludes)) { - params.put("_source_excludes", - request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (ApiTypeHelper.isDefined(request.sourceIncludes)) { - params.put("_source_includes", - request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.version != null) { params.put("version", String.valueOf(request.version)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ExistsSourceRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ExistsSourceRequest.java index 10fc45e34a..ee1d2a70a2 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ExistsSourceRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ExistsSourceRequest.java @@ -549,7 +549,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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.realtime != null) { params.put("realtime", String.valueOf(request.realtime)); @@ -567,12 +568,12 @@ public Builder rebuild() { params.put("_source", request.source._toJsonString()); } if (ApiTypeHelper.isDefined(request.sourceExcludes)) { - params.put("_source_excludes", - request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (ApiTypeHelper.isDefined(request.sourceIncludes)) { - params.put("_source_includes", - request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.version != null) { params.put("version", String.valueOf(request.version)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ExplainRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ExplainRequest.java index 2e89faca68..77a188df93 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ExplainRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ExplainRequest.java @@ -748,7 +748,8 @@ protected static void setupExplainRequestDeserializer(ObjectDeserializer { Map params = new HashMap<>(); 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.q != null) { params.put("q", request.q); @@ -763,8 +764,8 @@ protected static void setupExplainRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("stored_fields", request.storedFields.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.preference != null) { params.put("preference", request.preference); @@ -776,12 +777,12 @@ protected static void setupExplainRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (ApiTypeHelper.isDefined(request.sourceIncludes)) { - params.put("_source_includes", - request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.lenient != null) { params.put("lenient", String.valueOf(request.lenient)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/FieldCapsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/FieldCapsRequest.java index 26d7614956..5afcc381c6 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/FieldCapsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/FieldCapsRequest.java @@ -754,7 +754,8 @@ protected static void setupFieldCapsRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_field_caps"); return buf.toString(); } @@ -775,7 +776,8 @@ protected static void setupFieldCapsRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -784,11 +786,12 @@ protected static void setupFieldCapsRequestDeserializer(ObjectDeserializer { Map params = new HashMap<>(); if (ApiTypeHelper.isDefined(request.types)) { - params.put("types", request.types.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("types", request.types.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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); @@ -800,7 +803,8 @@ protected static void setupFieldCapsRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("filters", request.filters.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.includeUnmapped != null) { params.put("include_unmapped", String.valueOf(request.includeUnmapped)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/GetRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/GetRequest.java index 13d3e06f3a..ac207b35e4 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/GetRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/GetRequest.java @@ -756,7 +756,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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.realtime != null) { params.put("realtime", String.valueOf(request.realtime)); @@ -768,8 +769,8 @@ public Builder rebuild() { params.put("_source_exclude_vectors", String.valueOf(request.sourceExcludeVectors)); } if (ApiTypeHelper.isDefined(request.storedFields)) { - params.put("stored_fields", - request.storedFields.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("stored_fields", request.storedFields.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.preference != null) { params.put("preference", request.preference); @@ -781,15 +782,15 @@ public Builder rebuild() { params.put("_source", request.source._toJsonString()); } if (ApiTypeHelper.isDefined(request.sourceExcludes)) { - params.put("_source_excludes", - request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.forceSyntheticSource != null) { params.put("force_synthetic_source", String.valueOf(request.forceSyntheticSource)); } if (ApiTypeHelper.isDefined(request.sourceIncludes)) { - params.put("_source_includes", - request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.version != null) { params.put("version", String.valueOf(request.version)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/GetSourceRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/GetSourceRequest.java index 3dd2e4c790..74c367a650 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/GetSourceRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/GetSourceRequest.java @@ -550,7 +550,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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.realtime != null) { params.put("realtime", String.valueOf(request.realtime)); @@ -568,12 +569,12 @@ public Builder rebuild() { params.put("_source", request.source._toJsonString()); } if (ApiTypeHelper.isDefined(request.sourceExcludes)) { - params.put("_source_excludes", - request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (ApiTypeHelper.isDefined(request.sourceIncludes)) { - params.put("_source_includes", - request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.version != null) { params.put("version", String.valueOf(request.version)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/HealthReportRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/HealthReportRequest.java index 7f56ef0610..186add2c99 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/HealthReportRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/HealthReportRequest.java @@ -309,8 +309,8 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_health_report"); buf.append("/"); - SimpleEndpoint.pathEncode(request.feature.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.feature.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -330,7 +330,8 @@ public Builder rebuild() { if (propsSet == 0) { } if (propsSet == (_feature)) { - params.put("feature", request.feature.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("feature", request.feature.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/IndexRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/IndexRequest.java index 7baeefeb1e..57ad790737 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/IndexRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/IndexRequest.java @@ -1031,7 +1031,8 @@ public static JsonpDeserializer> createIndex params.put("pipeline", request.pipeline); } 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.requireAlias != null) { params.put("require_alias", String.valueOf(request.requireAlias)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MgetRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MgetRequest.java index 584d2d1b61..4d6799e192 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MgetRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MgetRequest.java @@ -721,14 +721,15 @@ protected static void setupMgetRequestDeserializer(ObjectDeserializer { Map params = new HashMap<>(); 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.realtime != null) { params.put("realtime", String.valueOf(request.realtime)); } if (ApiTypeHelper.isDefined(request.storedFields)) { - params.put("stored_fields", - request.storedFields.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("stored_fields", request.storedFields.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.preference != null) { params.put("preference", request.preference); @@ -740,15 +741,15 @@ protected static void setupMgetRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.forceSyntheticSource != null) { params.put("force_synthetic_source", String.valueOf(request.forceSyntheticSource)); } if (ApiTypeHelper.isDefined(request.sourceIncludes)) { - params.put("_source_includes", - request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MsearchRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MsearchRequest.java index 4406caa97e..a23c9baf22 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MsearchRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MsearchRequest.java @@ -700,7 +700,8 @@ public Builder rebuild() { 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("/_msearch"); return buf.toString(); } @@ -721,7 +722,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; }, @@ -737,8 +739,8 @@ public Builder rebuild() { params.put("max_concurrent_shard_requests", String.valueOf(request.maxConcurrentShardRequests)); } 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.projectRouting != null) { params.put("project_routing", request.projectRouting); @@ -753,7 +755,8 @@ public Builder rebuild() { params.put("ccs_minimize_roundtrips", String.valueOf(request.ccsMinimizeRoundtrips)); } 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)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MsearchTemplateRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MsearchTemplateRequest.java index e00076423e..9119428d31 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MsearchTemplateRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MsearchTemplateRequest.java @@ -397,7 +397,8 @@ public Builder rebuild() { 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("/_msearch"); buf.append("/template"); return buf.toString(); @@ -419,7 +420,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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MtermvectorsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MtermvectorsRequest.java index 59ff7c4115..07d640f27d 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MtermvectorsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/MtermvectorsRequest.java @@ -709,7 +709,8 @@ protected static void setupMtermvectorsRequestDeserializer(ObjectDeserializer { Map params = new HashMap<>(); 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.realtime != null) { params.put("realtime", String.valueOf(request.realtime)); @@ -736,7 +737,8 @@ protected static void setupMtermvectorsRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("fields", request.fields.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.version != null) { params.put("version", String.valueOf(request.version)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/OpenPointInTimeRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/OpenPointInTimeRequest.java index 165517d43c..bc64e0b491 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/OpenPointInTimeRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/OpenPointInTimeRequest.java @@ -624,7 +624,8 @@ protected static void setupOpenPointInTimeRequestDeserializer( 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("/_pit"); return buf.toString(); } @@ -642,7 +643,8 @@ protected static void setupOpenPointInTimeRequestDeserializer( propsSet |= _index; 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; }, @@ -651,7 +653,8 @@ protected static void setupOpenPointInTimeRequestDeserializer( request -> { Map params = new HashMap<>(); 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.maxConcurrentShardRequests != null) { params.put("max_concurrent_shard_requests", String.valueOf(request.maxConcurrentShardRequests)); @@ -663,8 +666,8 @@ protected static void setupOpenPointInTimeRequestDeserializer( params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); } 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); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/RankEvalRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/RankEvalRequest.java index d3b86a0c80..0a99799f84 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/RankEvalRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/RankEvalRequest.java @@ -481,7 +481,8 @@ protected static void setupRankEvalRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_rank_eval"); return buf.toString(); } @@ -502,7 +503,8 @@ protected static void setupRankEvalRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -511,8 +513,8 @@ protected static void setupRankEvalRequestDeserializer(ObjectDeserializer { Map params = new HashMap<>(); 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ReindexRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ReindexRequest.java index 147f96c579..00b6c1136a 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ReindexRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/ReindexRequest.java @@ -103,8 +103,8 @@ * cluster. If reindexing from a remote cluster into an Elastic Cloud Serverless * project, only remote hosts from Elastic - * Cloud Hosted and Elastic Cloud Serverless are allowed. Automatic data - * stream creation requires a matching index template with data stream enabled. + * Cloud Hosted are allowed. Automatic data stream creation requires a + * matching index template with data stream enabled. *

* The dest element can be configured like the index API to control * optimistic concurrency control. Omitting version_type or setting diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchMvtRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchMvtRequest.java index 40119a5205..9e03a52525 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchMvtRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchMvtRequest.java @@ -1509,7 +1509,8 @@ protected static void setupSearchMvtRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_mvt"); buf.append("/"); SimpleEndpoint.pathEncode(request.field, buf); @@ -1543,7 +1544,8 @@ protected static void setupSearchMvtRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); params.put("field", request.field); params.put("zoom", String.valueOf(request.zoom)); params.put("x", String.valueOf(request.x)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchRequest.java index 93a163edab..52a4acf182 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchRequest.java @@ -3041,7 +3041,8 @@ protected static void setupSearchRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_search"); return buf.toString(); } @@ -3062,7 +3063,8 @@ protected static void setupSearchRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -3087,7 +3089,8 @@ protected static void setupSearchRequestDeserializer(ObjectDeserializer 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)); @@ -3108,8 +3111,8 @@ protected static void setupSearchRequestDeserializer(ObjectDeserializer 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); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchShardsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchShardsRequest.java index 581621a9b7..1eba218b3b 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchShardsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchShardsRequest.java @@ -471,7 +471,8 @@ public Builder rebuild() { 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("/_search_shards"); return buf.toString(); } @@ -492,7 +493,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; }, @@ -504,11 +506,12 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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 (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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchTemplateRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchTemplateRequest.java index d1486a31e3..80d3f5411d 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchTemplateRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchTemplateRequest.java @@ -803,7 +803,8 @@ protected static void setupSearchTemplateRequestDeserializer(ObjectDeserializer< 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("/_search"); buf.append("/template"); return buf.toString(); @@ -825,7 +826,8 @@ protected static void setupSearchTemplateRequestDeserializer(ObjectDeserializer< 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; }, @@ -835,8 +837,8 @@ protected static void setupSearchTemplateRequestDeserializer(ObjectDeserializer< Map params = new HashMap<>(); params.put("typed_keys", "true"); 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); @@ -851,7 +853,8 @@ protected static void setupSearchTemplateRequestDeserializer(ObjectDeserializer< params.put("ccs_minimize_roundtrips", String.valueOf(request.ccsMinimizeRoundtrips)); } 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)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/TermsEnumRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/TermsEnumRequest.java index 0fcbb092ac..71e562187c 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/TermsEnumRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/TermsEnumRequest.java @@ -522,7 +522,8 @@ protected static void setupTermsEnumRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_terms_enum"); return buf.toString(); } @@ -540,7 +541,8 @@ protected static void setupTermsEnumRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/UpdateByQueryRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/UpdateByQueryRequest.java index a4d77ba17f..9b99a3b0af 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/UpdateByQueryRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/UpdateByQueryRequest.java @@ -1606,7 +1606,8 @@ protected static void setupUpdateByQueryRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_update_by_query"); return buf.toString(); } @@ -1624,7 +1625,8 @@ protected static void setupUpdateByQueryRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -1651,7 +1653,8 @@ protected static void setupUpdateByQueryRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("routing", request.routing.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.requestsPerSecond != null) { params.put("requests_per_second", String.valueOf(request.requestsPerSecond)); @@ -1660,7 +1663,8 @@ protected static void setupUpdateByQueryRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("stats", request.stats.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.allowNoIndices != null) { params.put("allow_no_indices", String.valueOf(request.allowNoIndices)); @@ -1672,8 +1676,8 @@ protected static void setupUpdateByQueryRequestDeserializer(ObjectDeserializer v.jsonValue()).collect(Collectors.joining(","))); + params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()) + .filter(Objects::nonNull).collect(Collectors.joining(","))); } if (request.versionType != null) { params.put("version_type", String.valueOf(request.versionType)); @@ -1697,7 +1701,8 @@ protected static void setupUpdateByQueryRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("sort", request.sort.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.searchType != null) { params.put("search_type", request.searchType.jsonValue()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/UpdateRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/UpdateRequest.java index c1d73019af..676c4c3f30 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/UpdateRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/UpdateRequest.java @@ -960,7 +960,8 @@ protected static void setupUpdateRequestDeserializ params.put("timeout", request.timeout._toJsonString()); } 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.requireAlias != null) { params.put("require_alias", String.valueOf(request.requireAlias)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SourceConfigParam.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SourceConfigParam.java index 591e49035b..08932c12f2 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SourceConfigParam.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SourceConfigParam.java @@ -96,7 +96,7 @@ private SourceConfigParam(Kind kind, Object value) { public String _toJsonString() { switch (_kind) { case Fields : - return this.fields().stream().map(v -> v).collect(Collectors.joining(",")); + return this.fields().stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")); case Fetch : return String.valueOf(this.fetch()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/doc-files/api-spec.html b/java-client/src/main/java/co/elastic/clients/elasticsearch/doc-files/api-spec.html index c068dcac2b..a4d8e4a746 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/doc-files/api-spec.html +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/doc-files/api-spec.html @@ -1901,33 +1901,31 @@ 'inference._types.AmazonBedrockServiceType': 'inference/_types/AmazonBedrockTypes.ts#L99-L101', 'inference._types.AmazonBedrockTaskSettings': 'inference/_types/AmazonBedrockTypes.ts#L67-L91', 'inference._types.AmazonBedrockTaskType': 'inference/_types/AmazonBedrockTypes.ts#L93-L97', -'inference._types.AmazonSageMakerApi': 'inference/_types/CommonTypes.ts#L724-L727', -'inference._types.AmazonSageMakerElementType': 'inference/_types/CommonTypes.ts#L735-L739', -'inference._types.AmazonSageMakerServiceSettings': 'inference/_types/CommonTypes.ts#L656-L722', -'inference._types.AmazonSageMakerServiceType': 'inference/_types/CommonTypes.ts#L790-L792', -'inference._types.AmazonSageMakerSimilarity': 'inference/_types/CommonTypes.ts#L729-L733', -'inference._types.AmazonSageMakerTaskSettings': 'inference/_types/CommonTypes.ts#L741-L770', -'inference._types.AnthropicServiceSettings': 'inference/_types/CommonTypes.ts#L794-L810', -'inference._types.AnthropicServiceType': 'inference/_types/CommonTypes.ts#L843-L845', -'inference._types.AnthropicTaskSettings': 'inference/_types/CommonTypes.ts#L812-L837', -'inference._types.AnthropicTaskType': 'inference/_types/CommonTypes.ts#L839-L841', -'inference._types.AzureAiStudioServiceSettings': 'inference/_types/CommonTypes.ts#L847-L887', -'inference._types.AzureAiStudioServiceType': 'inference/_types/CommonTypes.ts#L933-L935', -'inference._types.AzureAiStudioTaskSettings': 'inference/_types/CommonTypes.ts#L889-L925', -'inference._types.AzureAiStudioTaskType': 'inference/_types/CommonTypes.ts#L927-L931', -'inference._types.AzureOpenAIServiceSettings': 'inference/_types/CommonTypes.ts#L937-L1024', -'inference._types.AzureOpenAIServiceType': 'inference/_types/CommonTypes.ts#L1051-L1053', -'inference._types.AzureOpenAITaskSettings': 'inference/_types/CommonTypes.ts#L1026-L1043', -'inference._types.AzureOpenAITaskType': 'inference/_types/CommonTypes.ts#L1045-L1049', +'inference._types.AmazonSageMakerApi': 'inference/_types/CommonTypes.ts#L712-L715', +'inference._types.AmazonSageMakerServiceSettings': 'inference/_types/CommonTypes.ts#L656-L710', +'inference._types.AmazonSageMakerServiceType': 'inference/_types/CommonTypes.ts#L795-L797', +'inference._types.AmazonSageMakerTaskSettings': 'inference/_types/CommonTypes.ts#L746-L775', +'inference._types.AnthropicServiceSettings': 'inference/_types/CommonTypes.ts#L799-L815', +'inference._types.AnthropicServiceType': 'inference/_types/CommonTypes.ts#L848-L850', +'inference._types.AnthropicTaskSettings': 'inference/_types/CommonTypes.ts#L817-L842', +'inference._types.AnthropicTaskType': 'inference/_types/CommonTypes.ts#L844-L846', +'inference._types.AzureAiStudioServiceSettings': 'inference/_types/CommonTypes.ts#L852-L892', +'inference._types.AzureAiStudioServiceType': 'inference/_types/CommonTypes.ts#L938-L940', +'inference._types.AzureAiStudioTaskSettings': 'inference/_types/CommonTypes.ts#L894-L930', +'inference._types.AzureAiStudioTaskType': 'inference/_types/CommonTypes.ts#L932-L936', +'inference._types.AzureOpenAIServiceSettings': 'inference/_types/CommonTypes.ts#L942-L1029', +'inference._types.AzureOpenAIServiceType': 'inference/_types/CommonTypes.ts#L1056-L1058', +'inference._types.AzureOpenAITaskSettings': 'inference/_types/CommonTypes.ts#L1031-L1048', +'inference._types.AzureOpenAITaskType': 'inference/_types/CommonTypes.ts#L1050-L1054', 'inference._types.BaseReasoningDetail': 'inference/_types/CommonTypes.ts#L405-L422', -'inference._types.CohereEmbeddingType': 'inference/_types/CommonTypes.ts#L1106-L1112', -'inference._types.CohereInputType': 'inference/_types/CommonTypes.ts#L1114-L1119', -'inference._types.CohereServiceSettings': 'inference/_types/CommonTypes.ts#L1055-L1094', -'inference._types.CohereServiceType': 'inference/_types/CommonTypes.ts#L1102-L1104', -'inference._types.CohereSimilarityType': 'inference/_types/CommonTypes.ts#L1121-L1125', -'inference._types.CohereTaskSettings': 'inference/_types/CommonTypes.ts#L1133-L1165', -'inference._types.CohereTaskType': 'inference/_types/CommonTypes.ts#L1096-L1100', -'inference._types.CohereTruncateType': 'inference/_types/CommonTypes.ts#L1127-L1131', +'inference._types.CohereEmbeddingType': 'inference/_types/CommonTypes.ts#L1111-L1117', +'inference._types.CohereInputType': 'inference/_types/CommonTypes.ts#L1119-L1124', +'inference._types.CohereServiceSettings': 'inference/_types/CommonTypes.ts#L1060-L1099', +'inference._types.CohereServiceType': 'inference/_types/CommonTypes.ts#L1107-L1109', +'inference._types.CohereSimilarityType': 'inference/_types/CommonTypes.ts#L1126-L1130', +'inference._types.CohereTaskSettings': 'inference/_types/CommonTypes.ts#L1138-L1170', +'inference._types.CohereTaskType': 'inference/_types/CommonTypes.ts#L1101-L1105', +'inference._types.CohereTruncateType': 'inference/_types/CommonTypes.ts#L1132-L1136', 'inference._types.CompletionInferenceResult': 'inference/_types/Results.ts#L98-L103', 'inference._types.CompletionResult': 'inference/_types/Results.ts#L91-L96', 'inference._types.CompletionTool': 'inference/_types/CommonTypes.ts#L513-L525', @@ -1937,28 +1935,28 @@ 'inference._types.CompletionToolType': 'inference/_types/CommonTypes.ts#L154-L157', 'inference._types.ContentObject': 'inference/_types/CommonTypes.ts#L159-L180', 'inference._types.ContentType': 'inference/_types/CommonTypes.ts#L182-L186', -'inference._types.ContextualAIServiceSettings': 'inference/_types/CommonTypes.ts#L1455-L1476', -'inference._types.ContextualAIServiceType': 'inference/_types/CommonTypes.ts#L1451-L1453', -'inference._types.ContextualAITaskSettings': 'inference/_types/CommonTypes.ts#L1478-L1490', -'inference._types.CustomRequestParams': 'inference/_types/CommonTypes.ts#L1253-L1264', -'inference._types.CustomResponseParams': 'inference/_types/CommonTypes.ts#L1266-L1420', -'inference._types.CustomServiceInputType': 'inference/_types/CommonTypes.ts#L1167-L1172', -'inference._types.CustomServiceSettings': 'inference/_types/CommonTypes.ts#L1176-L1251', -'inference._types.CustomServiceType': 'inference/_types/CommonTypes.ts#L1429-L1431', -'inference._types.CustomTaskSettings': 'inference/_types/CommonTypes.ts#L1435-L1449', -'inference._types.CustomTaskType': 'inference/_types/CommonTypes.ts#L1422-L1427', -'inference._types.DeepSeekServiceSettings': 'inference/_types/CommonTypes.ts#L1492-L1512', -'inference._types.DeepSeekServiceType': 'inference/_types/CommonTypes.ts#L1514-L1516', +'inference._types.ContextualAIServiceSettings': 'inference/_types/CommonTypes.ts#L1460-L1481', +'inference._types.ContextualAIServiceType': 'inference/_types/CommonTypes.ts#L1456-L1458', +'inference._types.ContextualAITaskSettings': 'inference/_types/CommonTypes.ts#L1483-L1495', +'inference._types.CustomRequestParams': 'inference/_types/CommonTypes.ts#L1258-L1269', +'inference._types.CustomResponseParams': 'inference/_types/CommonTypes.ts#L1271-L1425', +'inference._types.CustomServiceInputType': 'inference/_types/CommonTypes.ts#L1172-L1177', +'inference._types.CustomServiceSettings': 'inference/_types/CommonTypes.ts#L1181-L1256', +'inference._types.CustomServiceType': 'inference/_types/CommonTypes.ts#L1434-L1436', +'inference._types.CustomTaskSettings': 'inference/_types/CommonTypes.ts#L1440-L1454', +'inference._types.CustomTaskType': 'inference/_types/CommonTypes.ts#L1427-L1432', +'inference._types.DeepSeekServiceSettings': 'inference/_types/CommonTypes.ts#L1497-L1517', +'inference._types.DeepSeekServiceType': 'inference/_types/CommonTypes.ts#L1519-L1521', 'inference._types.DeleteInferenceEndpointResult': 'inference/_types/Results.ts#L124-L129', 'inference._types.DenseEmbeddingByteResult': 'inference/_types/Results.ts#L57-L62', 'inference._types.DenseEmbeddingResult': 'inference/_types/Results.ts#L64-L69', -'inference._types.ElasticsearchServiceSettings': 'inference/_types/CommonTypes.ts#L1518-L1574', -'inference._types.ElasticsearchServiceType': 'inference/_types/CommonTypes.ts#L1590-L1592', -'inference._types.ElasticsearchTaskSettings': 'inference/_types/CommonTypes.ts#L1576-L1582', -'inference._types.ElasticsearchTaskType': 'inference/_types/CommonTypes.ts#L1584-L1588', -'inference._types.ElserServiceSettings': 'inference/_types/CommonTypes.ts#L1594-L1620', -'inference._types.ElserServiceType': 'inference/_types/CommonTypes.ts#L1626-L1628', -'inference._types.ElserTaskType': 'inference/_types/CommonTypes.ts#L1622-L1624', +'inference._types.ElasticsearchServiceSettings': 'inference/_types/CommonTypes.ts#L1523-L1579', +'inference._types.ElasticsearchServiceType': 'inference/_types/CommonTypes.ts#L1595-L1597', +'inference._types.ElasticsearchTaskSettings': 'inference/_types/CommonTypes.ts#L1581-L1587', +'inference._types.ElasticsearchTaskType': 'inference/_types/CommonTypes.ts#L1589-L1593', +'inference._types.ElserServiceSettings': 'inference/_types/CommonTypes.ts#L1599-L1625', +'inference._types.ElserServiceType': 'inference/_types/CommonTypes.ts#L1631-L1633', +'inference._types.ElserTaskType': 'inference/_types/CommonTypes.ts#L1627-L1629', 'inference._types.EmbeddingContentFormat': 'inference/_types/CommonTypes.ts#L647-L654', 'inference._types.EmbeddingContentObject': 'inference/_types/CommonTypes.ts#L610-L618', 'inference._types.EmbeddingContentObjectContents': 'inference/_types/CommonTypes.ts#L620-L637', @@ -1967,26 +1965,26 @@ 'inference._types.EmbeddingInput': 'inference/_types/CommonTypes.ts#L591-L596', 'inference._types.EncryptedReasoningDetail': 'inference/_types/CommonTypes.ts#L424-L434', 'inference._types.FileContent': 'inference/_types/CommonTypes.ts#L205-L214', -'inference._types.FireworksAIServiceSettings': 'inference/_types/CommonTypes.ts#L2042-L2082', -'inference._types.FireworksAIServiceType': 'inference/_types/CommonTypes.ts#L2090-L2092', -'inference._types.FireworksAISimilarityType': 'inference/_types/CommonTypes.ts#L2094-L2098', -'inference._types.FireworksAITaskSettings': 'inference/_types/CommonTypes.ts#L2100-L2117', -'inference._types.FireworksAITaskType': 'inference/_types/CommonTypes.ts#L2084-L2088', -'inference._types.GoogleAiServiceType': 'inference/_types/CommonTypes.ts#L1653-L1655', -'inference._types.GoogleAiStudioServiceSettings': 'inference/_types/CommonTypes.ts#L1630-L1646', -'inference._types.GoogleAiStudioTaskType': 'inference/_types/CommonTypes.ts#L1648-L1651', -'inference._types.GoogleModelGardenProvider': 'inference/_types/CommonTypes.ts#L1744-L1751', -'inference._types.GoogleVertexAIServiceSettings': 'inference/_types/CommonTypes.ts#L1657-L1742', -'inference._types.GoogleVertexAIServiceType': 'inference/_types/CommonTypes.ts#L1792-L1794', -'inference._types.GoogleVertexAITaskSettings': 'inference/_types/CommonTypes.ts#L1753-L1776', -'inference._types.GoogleVertexAITaskType': 'inference/_types/CommonTypes.ts#L1785-L1790', -'inference._types.GroqServiceSettings': 'inference/_types/CommonTypes.ts#L1796-L1818', -'inference._types.GroqServiceType': 'inference/_types/CommonTypes.ts#L1824-L1826', -'inference._types.GroqTaskType': 'inference/_types/CommonTypes.ts#L1820-L1822', -'inference._types.HuggingFaceServiceSettings': 'inference/_types/CommonTypes.ts#L1828-L1858', -'inference._types.HuggingFaceServiceType': 'inference/_types/CommonTypes.ts#L1879-L1881', -'inference._types.HuggingFaceTaskSettings': 'inference/_types/CommonTypes.ts#L1860-L1870', -'inference._types.HuggingFaceTaskType': 'inference/_types/CommonTypes.ts#L1872-L1877', +'inference._types.FireworksAIServiceSettings': 'inference/_types/CommonTypes.ts#L2047-L2087', +'inference._types.FireworksAIServiceType': 'inference/_types/CommonTypes.ts#L2095-L2097', +'inference._types.FireworksAISimilarityType': 'inference/_types/CommonTypes.ts#L2099-L2103', +'inference._types.FireworksAITaskSettings': 'inference/_types/CommonTypes.ts#L2105-L2122', +'inference._types.FireworksAITaskType': 'inference/_types/CommonTypes.ts#L2089-L2093', +'inference._types.GoogleAiServiceType': 'inference/_types/CommonTypes.ts#L1658-L1660', +'inference._types.GoogleAiStudioServiceSettings': 'inference/_types/CommonTypes.ts#L1635-L1651', +'inference._types.GoogleAiStudioTaskType': 'inference/_types/CommonTypes.ts#L1653-L1656', +'inference._types.GoogleModelGardenProvider': 'inference/_types/CommonTypes.ts#L1749-L1756', +'inference._types.GoogleVertexAIServiceSettings': 'inference/_types/CommonTypes.ts#L1662-L1747', +'inference._types.GoogleVertexAIServiceType': 'inference/_types/CommonTypes.ts#L1797-L1799', +'inference._types.GoogleVertexAITaskSettings': 'inference/_types/CommonTypes.ts#L1758-L1781', +'inference._types.GoogleVertexAITaskType': 'inference/_types/CommonTypes.ts#L1790-L1795', +'inference._types.GroqServiceSettings': 'inference/_types/CommonTypes.ts#L1801-L1823', +'inference._types.GroqServiceType': 'inference/_types/CommonTypes.ts#L1829-L1831', +'inference._types.GroqTaskType': 'inference/_types/CommonTypes.ts#L1825-L1827', +'inference._types.HuggingFaceServiceSettings': 'inference/_types/CommonTypes.ts#L1833-L1863', +'inference._types.HuggingFaceServiceType': 'inference/_types/CommonTypes.ts#L1884-L1886', +'inference._types.HuggingFaceTaskSettings': 'inference/_types/CommonTypes.ts#L1865-L1875', +'inference._types.HuggingFaceTaskType': 'inference/_types/CommonTypes.ts#L1877-L1882', 'inference._types.ImageUrl': 'inference/_types/CommonTypes.ts#L188-L197', 'inference._types.ImageUrlDetail': 'inference/_types/CommonTypes.ts#L199-L203', 'inference._types.InferenceChunkingSettings': 'inference/_types/Services.ts#L375-L434', @@ -2019,17 +2017,17 @@ 'inference._types.InferenceEndpointInfoVoyageAI': 'inference/_types/Services.ts#L353-L362', 'inference._types.InferenceEndpointInfoWatsonx': 'inference/_types/Services.ts#L364-L373', 'inference._types.InferenceResult': 'inference/_types/Results.ts#L131-L145', -'inference._types.JinaAIElementType': 'inference/_types/CommonTypes.ts#L1988-L1992', -'inference._types.JinaAIServiceSettings': 'inference/_types/CommonTypes.ts#L1883-L1931', -'inference._types.JinaAIServiceType': 'inference/_types/CommonTypes.ts#L1971-L1973', -'inference._types.JinaAISimilarityType': 'inference/_types/CommonTypes.ts#L1975-L1979', -'inference._types.JinaAITaskSettings': 'inference/_types/CommonTypes.ts#L1933-L1963', -'inference._types.JinaAITaskType': 'inference/_types/CommonTypes.ts#L1965-L1969', -'inference._types.JinaAITextEmbeddingTask': 'inference/_types/CommonTypes.ts#L1981-L1986', -'inference._types.LlamaServiceSettings': 'inference/_types/CommonTypes.ts#L1994-L2024', -'inference._types.LlamaServiceType': 'inference/_types/CommonTypes.ts#L2032-L2034', -'inference._types.LlamaSimilarityType': 'inference/_types/CommonTypes.ts#L2036-L2040', -'inference._types.LlamaTaskType': 'inference/_types/CommonTypes.ts#L2026-L2030', +'inference._types.JinaAIElementType': 'inference/_types/CommonTypes.ts#L1993-L1997', +'inference._types.JinaAIServiceSettings': 'inference/_types/CommonTypes.ts#L1888-L1936', +'inference._types.JinaAIServiceType': 'inference/_types/CommonTypes.ts#L1976-L1978', +'inference._types.JinaAISimilarityType': 'inference/_types/CommonTypes.ts#L1980-L1984', +'inference._types.JinaAITaskSettings': 'inference/_types/CommonTypes.ts#L1938-L1968', +'inference._types.JinaAITaskType': 'inference/_types/CommonTypes.ts#L1970-L1974', +'inference._types.JinaAITextEmbeddingTask': 'inference/_types/CommonTypes.ts#L1986-L1991', +'inference._types.LlamaServiceSettings': 'inference/_types/CommonTypes.ts#L1999-L2029', +'inference._types.LlamaServiceType': 'inference/_types/CommonTypes.ts#L2037-L2039', +'inference._types.LlamaSimilarityType': 'inference/_types/CommonTypes.ts#L2041-L2045', +'inference._types.LlamaTaskType': 'inference/_types/CommonTypes.ts#L2031-L2035', 'inference._types.Message': 'inference/_types/CommonTypes.ts#L300-L393', 'inference._types.MessageContent': 'inference/_types/CommonTypes.ts#L295-L298', 'inference._types.MistralServiceSettings': 'inference/_types/MistralTypes.ts#L23-L48', @@ -2041,16 +2039,16 @@ 'inference._types.NvidiaSimilarityType': 'inference/_types/NvidiaTypes.ts#L75-L79', 'inference._types.NvidiaTaskSettings': 'inference/_types/NvidiaTypes.ts#L81-L101', 'inference._types.NvidiaTaskType': 'inference/_types/NvidiaTypes.ts#L64-L69', -'inference._types.OpenAIServiceSettings': 'inference/_types/CommonTypes.ts#L2119-L2163', -'inference._types.OpenAIServiceType': 'inference/_types/CommonTypes.ts#L2196-L2198', -'inference._types.OpenAISimilarityType': 'inference/_types/CommonTypes.ts#L2165-L2169', -'inference._types.OpenAITaskSettings': 'inference/_types/CommonTypes.ts#L2171-L2188', -'inference._types.OpenAITaskType': 'inference/_types/CommonTypes.ts#L2190-L2194', -'inference._types.OpenShiftAiServiceSettings': 'inference/_types/CommonTypes.ts#L2200-L2233', -'inference._types.OpenShiftAiServiceType': 'inference/_types/CommonTypes.ts#L2242-L2244', -'inference._types.OpenShiftAiSimilarityType': 'inference/_types/CommonTypes.ts#L2246-L2250', -'inference._types.OpenShiftAiTaskSettings': 'inference/_types/CommonTypes.ts#L2252-L2261', -'inference._types.OpenShiftAiTaskType': 'inference/_types/CommonTypes.ts#L2235-L2240', +'inference._types.OpenAIServiceSettings': 'inference/_types/CommonTypes.ts#L2124-L2168', +'inference._types.OpenAIServiceType': 'inference/_types/CommonTypes.ts#L2201-L2203', +'inference._types.OpenAISimilarityType': 'inference/_types/CommonTypes.ts#L2170-L2174', +'inference._types.OpenAITaskSettings': 'inference/_types/CommonTypes.ts#L2176-L2193', +'inference._types.OpenAITaskType': 'inference/_types/CommonTypes.ts#L2195-L2199', +'inference._types.OpenShiftAiServiceSettings': 'inference/_types/CommonTypes.ts#L2205-L2238', +'inference._types.OpenShiftAiServiceType': 'inference/_types/CommonTypes.ts#L2247-L2249', +'inference._types.OpenShiftAiSimilarityType': 'inference/_types/CommonTypes.ts#L2251-L2255', +'inference._types.OpenShiftAiTaskSettings': 'inference/_types/CommonTypes.ts#L2257-L2266', +'inference._types.OpenShiftAiTaskType': 'inference/_types/CommonTypes.ts#L2240-L2245', 'inference._types.RankedDocument': 'inference/_types/Results.ts#L105-L115', 'inference._types.RateLimitSetting': 'inference/_types/Services.ts#L440-L471', 'inference._types.Reasoning': 'inference/_types/CommonTypes.ts#L216-L246', @@ -2092,16 +2090,16 @@ 'inference._types.TaskTypeWatsonx': 'inference/_types/TaskType.ts#L178-L182', 'inference._types.TextEmbeddingInferenceResult': 'inference/_types/Results.ts#L71-L79', 'inference._types.TextReasoningDetail': 'inference/_types/CommonTypes.ts#L448-L463', -'inference._types.ThinkingConfig': 'inference/_types/CommonTypes.ts#L1778-L1783', +'inference._types.ThinkingConfig': 'inference/_types/CommonTypes.ts#L1783-L1788', 'inference._types.ToolCall': 'inference/_types/CommonTypes.ts#L277-L293', 'inference._types.ToolCallFunction': 'inference/_types/CommonTypes.ts#L263-L275', -'inference._types.VoyageAIServiceSettings': 'inference/_types/CommonTypes.ts#L2263-L2294', -'inference._types.VoyageAIServiceType': 'inference/_types/CommonTypes.ts#L2327-L2329', -'inference._types.VoyageAITaskSettings': 'inference/_types/CommonTypes.ts#L2296-L2320', -'inference._types.VoyageAITaskType': 'inference/_types/CommonTypes.ts#L2322-L2325', -'inference._types.WatsonxServiceSettings': 'inference/_types/CommonTypes.ts#L2331-L2367', -'inference._types.WatsonxServiceType': 'inference/_types/CommonTypes.ts#L2376-L2378', -'inference._types.WatsonxTaskType': 'inference/_types/CommonTypes.ts#L2369-L2374', +'inference._types.VoyageAIServiceSettings': 'inference/_types/CommonTypes.ts#L2268-L2299', +'inference._types.VoyageAIServiceType': 'inference/_types/CommonTypes.ts#L2332-L2334', +'inference._types.VoyageAITaskSettings': 'inference/_types/CommonTypes.ts#L2301-L2325', +'inference._types.VoyageAITaskType': 'inference/_types/CommonTypes.ts#L2327-L2330', +'inference._types.WatsonxServiceSettings': 'inference/_types/CommonTypes.ts#L2336-L2372', +'inference._types.WatsonxServiceType': 'inference/_types/CommonTypes.ts#L2381-L2383', +'inference._types.WatsonxTaskType': 'inference/_types/CommonTypes.ts#L2374-L2379', 'inference.chat_completion_unified.Request': 'inference/chat_completion_unified/UnifiedRequest.ts#L24-L63', 'inference.chat_completion_unified.Response': 'inference/chat_completion_unified/UnifiedResponse.ts#L22-L25', 'inference.completion.Request': 'inference/completion/CompletionRequest.ts#L25-L72', @@ -3222,7 +3220,7 @@ 'snapshot.repository_analyze.DetailsInfo': 'snapshot/repository_analyze/SnapshotAnalyzeRepositoryResponse.ts#L286-L321', 'snapshot.repository_analyze.ReadBlobDetails': 'snapshot/repository_analyze/SnapshotAnalyzeRepositoryResponse.ts#L204-L248', 'snapshot.repository_analyze.ReadSummaryInfo': 'snapshot/repository_analyze/SnapshotAnalyzeRepositoryResponse.ts#L115-L160', -'snapshot.repository_analyze.Request': 'snapshot/repository_analyze/SnapshotAnalyzeRepositoryRequest.ts#L25-L239', +'snapshot.repository_analyze.Request': 'snapshot/repository_analyze/SnapshotAnalyzeRepositoryRequest.ts#L25-L232', 'snapshot.repository_analyze.Response': 'snapshot/repository_analyze/SnapshotAnalyzeRepositoryResponse.ts#L24-L108', 'snapshot.repository_analyze.SnapshotNodeInfo': 'snapshot/repository_analyze/SnapshotAnalyzeRepositoryResponse.ts#L110-L113', 'snapshot.repository_analyze.SummaryInfo': 'snapshot/repository_analyze/SnapshotAnalyzeRepositoryResponse.ts#L193-L202', @@ -3310,10 +3308,10 @@ 'transform._types.PivotGroupByContainer': 'transform/_types/Transform.ts#L70-L78', 'transform._types.RetentionPolicy': 'transform/_types/Transform.ts#L88-L96', 'transform._types.RetentionPolicyContainer': 'transform/_types/Transform.ts#L80-L86', -'transform._types.Settings': 'transform/_types/Transform.ts#L98-L165', -'transform._types.Source': 'transform/_types/Transform.ts#L167-L198', -'transform._types.SyncContainer': 'transform/_types/Transform.ts#L202-L208', -'transform._types.TimeSync': 'transform/_types/Transform.ts#L210-L222', +'transform._types.Settings': 'transform/_types/Transform.ts#L98-L166', +'transform._types.Source': 'transform/_types/Transform.ts#L168-L199', +'transform._types.SyncContainer': 'transform/_types/Transform.ts#L203-L209', +'transform._types.TimeSync': 'transform/_types/Transform.ts#L211-L223', 'transform.delete_transform.Request': 'transform/delete_transform/DeleteTransformRequest.ts#L24-L66', 'transform.delete_transform.Response': 'transform/delete_transform/DeleteTransformResponse.ts#L22-L25', 'transform.get_node_stats.Request': 'transform/get_node_stats/GetNodeStatsRequest.ts#L23-L40', @@ -3557,10 +3555,10 @@ if (hash.length > 1) { hash = hash.substring(1); } - window.location = "https://github.com/elastic/elasticsearch-specification/tree/5965499a37c8bc59b568b5ab9153c30f4d17df42/specification/" + (paths[hash] || ""); + window.location = "https://github.com/elastic/elasticsearch-specification/tree/55402308cca81b60887fb8662d1d6fbfc2806778/specification/" + (paths[hash] || ""); - Please see the Elasticsearch API specification. + Please see the Elasticsearch API specification. diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/enrich/GetPolicyRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/enrich/GetPolicyRequest.java index 07f7fa402b..c671488cbe 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/enrich/GetPolicyRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/enrich/GetPolicyRequest.java @@ -224,7 +224,9 @@ public Builder rebuild() { buf.append("/_enrich"); buf.append("/policy"); 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(); } if (propsSet == 0) { @@ -248,7 +250,8 @@ public Builder rebuild() { propsSet |= _name; 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(","))); } if (propsSet == 0) { } diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/eql/EqlSearchRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/eql/EqlSearchRequest.java index b81c3df183..588fbd0ad9 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/eql/EqlSearchRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/eql/EqlSearchRequest.java @@ -1100,7 +1100,8 @@ protected static void setupEqlSearchRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_eql"); buf.append("/search"); return buf.toString(); @@ -1119,7 +1120,8 @@ protected static void setupEqlSearchRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -1128,8 +1130,8 @@ protected static void setupEqlSearchRequestDeserializer(ObjectDeserializer { Map params = new HashMap<>(); 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/FleetSearchRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/FleetSearchRequest.java index a5da81c9b6..51cd9510d5 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/FleetSearchRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/FleetSearchRequest.java @@ -2399,7 +2399,8 @@ protected static void setupFleetSearchRequestDeserializer(ObjectDeserializer 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)); @@ -2420,8 +2421,8 @@ protected static void setupFleetSearchRequestDeserializer(ObjectDeserializer 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); @@ -2449,7 +2450,7 @@ protected static void setupFleetSearchRequestDeserializer(ObjectDeserializer String.valueOf(v)) - .collect(Collectors.joining(","))); + .filter(Objects::nonNull).collect(Collectors.joining(","))); } if (request.batchedReduceSize != null) { params.put("batched_reduce_size", String.valueOf(request.batchedReduceSize)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/graph/ExploreRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/graph/ExploreRequest.java index 2f57945ecc..f38a4f7021 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/graph/ExploreRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/graph/ExploreRequest.java @@ -511,7 +511,8 @@ protected static void setupExploreRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_graph"); buf.append("/explore"); return buf.toString(); @@ -530,7 +531,8 @@ protected static void setupExploreRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -539,7 +541,8 @@ protected static void setupExploreRequestDeserializer(ObjectDeserializer { Map params = new HashMap<>(); 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.timeout != null) { params.put("timeout", request.timeout._toJsonString()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/AddBlockRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/AddBlockRequest.java index ea7467b984..c3b552fba2 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/AddBlockRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/AddBlockRequest.java @@ -444,7 +444,8 @@ public Builder rebuild() { if (propsSet == (_index | _block)) { 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("/_block"); buf.append("/"); SimpleEndpoint.pathEncode(request.block.jsonValue(), buf); @@ -466,7 +467,8 @@ public Builder rebuild() { propsSet |= _block; if (propsSet == (_index | _block)) { - 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(","))); params.put("block", request.block.jsonValue()); } return params; @@ -479,8 +481,8 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/CancelMigrateReindexRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/CancelMigrateReindexRequest.java index 3604d359fe..1a44b41109 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/CancelMigrateReindexRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/CancelMigrateReindexRequest.java @@ -183,7 +183,8 @@ public Builder rebuild() { buf.append("/_migration"); buf.append("/reindex"); 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("/_cancel"); return buf.toString(); } @@ -201,7 +202,8 @@ public Builder rebuild() { propsSet |= _index; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ClearCacheRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ClearCacheRequest.java index 30a266950f..be29bffa46 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ClearCacheRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ClearCacheRequest.java @@ -453,7 +453,8 @@ public Builder rebuild() { 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("/_cache"); buf.append("/clear"); return buf.toString(); @@ -475,7 +476,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; }, @@ -490,8 +492,8 @@ public Builder rebuild() { params.put("fielddata", String.valueOf(request.fielddata)); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); @@ -503,7 +505,8 @@ public Builder rebuild() { params.put("query", String.valueOf(request.query)); } if (ApiTypeHelper.isDefined(request.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; diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/CloseIndexRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/CloseIndexRequest.java index 4e3e7feea2..9c529a3123 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/CloseIndexRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/CloseIndexRequest.java @@ -459,7 +459,8 @@ public Builder rebuild() { 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("/_close"); return buf.toString(); } @@ -477,7 +478,8 @@ public Builder rebuild() { propsSet |= _index; 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; }, @@ -489,8 +491,8 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DataStreamsStatsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DataStreamsStatsRequest.java index 9fd1855d54..0665a7dbbe 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DataStreamsStatsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DataStreamsStatsRequest.java @@ -239,7 +239,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_data_stream"); 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); buf.append("/_stats"); return buf.toString(); } @@ -260,7 +262,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; }, @@ -269,8 +272,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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(","))); } return params; diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteAliasRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteAliasRequest.java index 60663df0d4..146008566d 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteAliasRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteAliasRequest.java @@ -310,19 +310,25 @@ public Builder rebuild() { if (propsSet == (_index | _name)) { 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("/_alias"); 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(); } if (propsSet == (_index | _name)) { 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("/_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"); @@ -341,12 +347,16 @@ public Builder rebuild() { propsSet |= _index; if (propsSet == (_index | _name)) { - params.put("index", request.index.stream().map(v -> v).collect(Collectors.joining(","))); - params.put("name", request.name.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); + params.put("name", request.name.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (propsSet == (_index | _name)) { - params.put("index", request.index.stream().map(v -> v).collect(Collectors.joining(","))); - params.put("name", request.name.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); + params.put("name", request.name.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteDataLifecycleRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteDataLifecycleRequest.java index 625fc2a3ab..577016469f 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteDataLifecycleRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteDataLifecycleRequest.java @@ -304,7 +304,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_data_stream"); 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); buf.append("/_lifecycle"); return buf.toString(); } @@ -322,7 +324,8 @@ public Builder rebuild() { propsSet |= _name; 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; }, @@ -334,8 +337,8 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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.timeout != null) { params.put("timeout", request.timeout._toJsonString()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteDataStreamOptionsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteDataStreamOptionsRequest.java index 5711cb5b83..e3882499e6 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteDataStreamOptionsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteDataStreamOptionsRequest.java @@ -301,7 +301,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_data_stream"); 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); buf.append("/_options"); return buf.toString(); } @@ -319,7 +321,8 @@ public Builder rebuild() { propsSet |= _name; 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; }, @@ -331,8 +334,8 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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.timeout != null) { params.put("timeout", request.timeout._toJsonString()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteDataStreamRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteDataStreamRequest.java index 46b7ca0e00..9171d4891b 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteDataStreamRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteDataStreamRequest.java @@ -269,7 +269,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_data_stream"); 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"); @@ -286,7 +288,8 @@ public Builder rebuild() { propsSet |= _name; 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; }, @@ -298,8 +301,8 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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(","))); } return params; diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteIndexRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteIndexRequest.java index e01bc99191..beccced1c6 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteIndexRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteIndexRequest.java @@ -403,7 +403,8 @@ public Builder rebuild() { 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); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -420,7 +421,8 @@ public Builder rebuild() { propsSet |= _index; 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; }, @@ -432,8 +434,8 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteIndexTemplateRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteIndexTemplateRequest.java index 553c97a332..b76ad09477 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteIndexTemplateRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DeleteIndexTemplateRequest.java @@ -268,7 +268,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_index_template"); 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"); @@ -285,7 +287,8 @@ public Builder rebuild() { propsSet |= _name; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DiskUsageRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DiskUsageRequest.java index 5047eab889..0d05ebb3bd 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DiskUsageRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DiskUsageRequest.java @@ -388,7 +388,8 @@ public Builder rebuild() { 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("/_disk_usage"); return buf.toString(); } @@ -406,7 +407,8 @@ public Builder rebuild() { propsSet |= _index; 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; }, @@ -418,8 +420,8 @@ public Builder rebuild() { params.put("flush", String.valueOf(request.flush)); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsAliasRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsAliasRequest.java index eb21809e01..8e5507da63 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsAliasRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsAliasRequest.java @@ -400,16 +400,21 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_alias"); 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(); } if (propsSet == (_index | _name)) { 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("/_alias"); 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"); @@ -429,11 +434,14 @@ public Builder rebuild() { propsSet |= _index; 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(","))); } if (propsSet == (_index | _name)) { - params.put("index", request.index.stream().map(v -> v).collect(Collectors.joining(","))); - params.put("name", request.name.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); + params.put("name", request.name.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -445,8 +453,8 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsRequest.java index 54072fd598..c6fd69d875 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsRequest.java @@ -393,7 +393,8 @@ public Builder rebuild() { 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); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -410,7 +411,8 @@ public Builder rebuild() { propsSet |= _index; 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; }, @@ -422,8 +424,8 @@ public Builder rebuild() { params.put("flat_settings", String.valueOf(request.flatSettings)); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsTemplateRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsTemplateRequest.java index 7a43c15123..5d983e5a10 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsTemplateRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsTemplateRequest.java @@ -300,7 +300,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_template"); 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"); @@ -317,7 +319,8 @@ public Builder rebuild() { propsSet |= _name; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExplainDataLifecycleRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExplainDataLifecycleRequest.java index 8fdad3a4b5..25c301aa97 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExplainDataLifecycleRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExplainDataLifecycleRequest.java @@ -252,7 +252,8 @@ public Builder rebuild() { 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("/_lifecycle"); buf.append("/explain"); return buf.toString(); @@ -271,7 +272,8 @@ public Builder rebuild() { propsSet |= _index; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/FieldUsageStatsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/FieldUsageStatsRequest.java index ab3aa997cb..0f351787f1 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/FieldUsageStatsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/FieldUsageStatsRequest.java @@ -359,7 +359,8 @@ public Builder rebuild() { 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("/_field_usage_stats"); return buf.toString(); } @@ -377,7 +378,8 @@ public Builder rebuild() { propsSet |= _index; 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; }, @@ -386,8 +388,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); @@ -396,7 +398,8 @@ public Builder rebuild() { params.put("allow_no_indices", String.valueOf(request.allowNoIndices)); } if (ApiTypeHelper.isDefined(request.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; diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/FlushRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/FlushRequest.java index f48873ac59..7dafa5c04c 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/FlushRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/FlushRequest.java @@ -396,7 +396,8 @@ public Builder rebuild() { 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("/_flush"); return buf.toString(); } @@ -417,7 +418,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; }, @@ -426,8 +428,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ForcemergeRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ForcemergeRequest.java index 52fd77ac9f..b0a35c369b 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ForcemergeRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ForcemergeRequest.java @@ -493,7 +493,8 @@ public Builder rebuild() { 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("/_forcemerge"); return buf.toString(); } @@ -514,7 +515,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; }, @@ -529,8 +531,8 @@ public Builder rebuild() { params.put("only_expunge_deletes", String.valueOf(request.onlyExpungeDeletes)); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetAliasRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetAliasRequest.java index 47d10078a4..9e86bfa797 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetAliasRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetAliasRequest.java @@ -406,22 +406,28 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_alias"); 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(); } if (propsSet == (_index | _name)) { 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("/_alias"); 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(); } 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("/_alias"); return buf.toString(); } @@ -445,14 +451,18 @@ 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(","))); } if (propsSet == (_index | _name)) { - params.put("index", request.index.stream().map(v -> v).collect(Collectors.joining(","))); - params.put("name", request.name.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); + params.put("name", request.name.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } 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; }, @@ -464,8 +474,8 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataLifecycleRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataLifecycleRequest.java index 576917c2b3..70ac504d7c 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataLifecycleRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataLifecycleRequest.java @@ -301,7 +301,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_data_stream"); 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); buf.append("/_lifecycle"); return buf.toString(); } @@ -319,7 +321,8 @@ public Builder rebuild() { propsSet |= _name; 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; }, @@ -331,8 +334,8 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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.includeDefaults != null) { params.put("include_defaults", String.valueOf(request.includeDefaults)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamMappingsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamMappingsRequest.java index 00f3bc135c..1bdc052c10 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamMappingsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamMappingsRequest.java @@ -225,7 +225,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_data_stream"); 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); buf.append("/_mappings"); return buf.toString(); } @@ -243,7 +245,8 @@ public Builder rebuild() { propsSet |= _name; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamOptionsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamOptionsRequest.java index 8126d15e98..961634eac9 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamOptionsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamOptionsRequest.java @@ -272,7 +272,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_data_stream"); 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); buf.append("/_options"); return buf.toString(); } @@ -290,7 +292,8 @@ public Builder rebuild() { propsSet |= _name; 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; }, @@ -302,8 +305,8 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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(","))); } return params; diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamRequest.java index bdc550cb38..3cdb18df80 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamRequest.java @@ -337,7 +337,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_data_stream"); 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"); @@ -357,7 +359,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; }, @@ -369,8 +372,8 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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.includeDefaults != null) { params.put("include_defaults", String.valueOf(request.includeDefaults)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamSettingsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamSettingsRequest.java index 19d2bc5a01..9759fcd240 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamSettingsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetDataStreamSettingsRequest.java @@ -225,7 +225,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_data_stream"); 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); buf.append("/_settings"); return buf.toString(); } @@ -243,7 +245,8 @@ public Builder rebuild() { propsSet |= _name; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetFieldMappingRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetFieldMappingRequest.java index f496de8e2d..c14bcf70d3 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetFieldMappingRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetFieldMappingRequest.java @@ -391,19 +391,20 @@ public Builder rebuild() { buf.append("/_mapping"); buf.append("/field"); 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(); } if (propsSet == (_index | _fields)) { 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("/_mapping"); buf.append("/field"); 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"); @@ -423,11 +424,14 @@ public Builder rebuild() { propsSet |= _fields; 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(","))); } if (propsSet == (_index | _fields)) { - params.put("index", request.index.stream().map(v -> v).collect(Collectors.joining(","))); - params.put("fields", request.fields.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); + params.put("fields", request.fields.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -436,8 +440,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetIndexRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetIndexRequest.java index a8231ed81b..c107508334 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetIndexRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetIndexRequest.java @@ -471,7 +471,8 @@ public Builder rebuild() { 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); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -488,7 +489,8 @@ public Builder rebuild() { propsSet |= _index; 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; }, @@ -500,15 +502,15 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } if (ApiTypeHelper.isDefined(request.features)) { - params.put("features", - request.features.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("features", request.features.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.flatSettings != null) { params.put("flat_settings", String.valueOf(request.flatSettings)); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetIndicesSettingsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetIndicesSettingsRequest.java index afae3aaa29..eb31da4bfa 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetIndicesSettingsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetIndicesSettingsRequest.java @@ -496,24 +496,30 @@ public Builder rebuild() { 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("/_settings"); return buf.toString(); } if (propsSet == (_index | _name)) { 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("/_settings"); 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(); } if (propsSet == (_name)) { StringBuilder buf = new StringBuilder(); buf.append("/_settings"); 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"); @@ -536,14 +542,18 @@ 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(","))); } if (propsSet == (_index | _name)) { - params.put("index", request.index.stream().map(v -> v).collect(Collectors.joining(","))); - params.put("name", request.name.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); + params.put("name", request.name.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } 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; }, @@ -558,8 +568,8 @@ public Builder rebuild() { params.put("flat_settings", String.valueOf(request.flatSettings)); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetMappingRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetMappingRequest.java index 22bb8ce04f..919f834647 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetMappingRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetMappingRequest.java @@ -397,7 +397,8 @@ public Builder rebuild() { 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("/_mapping"); return buf.toString(); } @@ -418,7 +419,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; }, @@ -430,8 +432,8 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetMigrateReindexStatusRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetMigrateReindexStatusRequest.java index 7b6872f21e..e0850dd977 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetMigrateReindexStatusRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetMigrateReindexStatusRequest.java @@ -184,7 +184,8 @@ public Builder rebuild() { buf.append("/_migration"); buf.append("/reindex"); 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("/_status"); return buf.toString(); } @@ -202,7 +203,8 @@ public Builder rebuild() { propsSet |= _index; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetTemplateRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetTemplateRequest.java index 03b3c1f5d9..abd0507adf 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetTemplateRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetTemplateRequest.java @@ -309,7 +309,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_template"); 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"); @@ -329,7 +331,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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/IndicesStatsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/IndicesStatsRequest.java index 57af319cf0..e70b34d8d8 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/IndicesStatsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/IndicesStatsRequest.java @@ -587,25 +587,27 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_stats"); buf.append("/"); - SimpleEndpoint.pathEncode( - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } 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("/_stats"); return buf.toString(); } if (propsSet == (_index | _metric)) { 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("/_stats"); buf.append("/"); - SimpleEndpoint.pathEncode( - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -628,16 +630,18 @@ public Builder rebuild() { if (propsSet == 0) { } if (propsSet == (_metric)) { - params.put("metric", - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("metric", request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } 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(","))); } if (propsSet == (_index | _metric)) { - params.put("index", request.index.stream().map(v -> v).collect(Collectors.joining(","))); - params.put("metric", - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); + params.put("metric", request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -646,28 +650,30 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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.level != null) { params.put("level", request.level.jsonValue()); } if (ApiTypeHelper.isDefined(request.completionFields)) { - params.put("completion_fields", - request.completionFields.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("completion_fields", request.completionFields.stream().map(v -> v) + .filter(Objects::nonNull).collect(Collectors.joining(","))); } if (ApiTypeHelper.isDefined(request.fielddataFields)) { - params.put("fielddata_fields", - request.fielddataFields.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("fielddata_fields", request.fielddataFields.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (ApiTypeHelper.isDefined(request.groups)) { - params.put("groups", request.groups.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("groups", request.groups.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.includeUnloadedSegments != null) { params.put("include_unloaded_segments", String.valueOf(request.includeUnloadedSegments)); } if (ApiTypeHelper.isDefined(request.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(","))); } if (request.forbidClosedIndices != null) { params.put("forbid_closed_indices", String.valueOf(request.forbidClosedIndices)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/OpenRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/OpenRequest.java index 02e2d84eed..12e35d5f16 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/OpenRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/OpenRequest.java @@ -477,7 +477,8 @@ public Builder rebuild() { 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("/_open"); return buf.toString(); } @@ -495,7 +496,8 @@ public Builder rebuild() { propsSet |= _index; 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; }, @@ -507,8 +509,8 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutAliasRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutAliasRequest.java index 3463f8f934..345ae35b6f 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutAliasRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutAliasRequest.java @@ -536,7 +536,8 @@ protected static void setupPutAliasRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_alias"); buf.append("/"); SimpleEndpoint.pathEncode(request.name, buf); @@ -545,7 +546,8 @@ protected static void setupPutAliasRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_aliases"); buf.append("/"); SimpleEndpoint.pathEncode(request.name, buf); @@ -567,11 +569,13 @@ protected static void setupPutAliasRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); params.put("name", request.name); } if (propsSet == (_index | _name)) { - 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(","))); params.put("name", request.name); } return params; diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataLifecycleRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataLifecycleRequest.java index 12c5c573da..c0d8696bc5 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataLifecycleRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataLifecycleRequest.java @@ -539,7 +539,9 @@ protected static void setupPutDataLifecycleRequestDeserializer( StringBuilder buf = new StringBuilder(); buf.append("/_data_stream"); 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); buf.append("/_lifecycle"); return buf.toString(); } @@ -557,7 +559,8 @@ protected static void setupPutDataLifecycleRequestDeserializer( propsSet |= _name; 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; }, @@ -569,8 +572,8 @@ protected static void setupPutDataLifecycleRequestDeserializer( params.put("master_timeout", request.masterTimeout._toJsonString()); } 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.timeout != null) { params.put("timeout", request.timeout._toJsonString()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataStreamMappingsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataStreamMappingsRequest.java index 5625701148..3007938124 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataStreamMappingsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataStreamMappingsRequest.java @@ -358,7 +358,9 @@ protected static JsonpDeserializer createPutDataSt StringBuilder buf = new StringBuilder(); buf.append("/_data_stream"); 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); buf.append("/_mappings"); return buf.toString(); } @@ -376,7 +378,8 @@ protected static JsonpDeserializer createPutDataSt propsSet |= _name; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataStreamOptionsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataStreamOptionsRequest.java index 21c52ad8e0..ef08147fd1 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataStreamOptionsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataStreamOptionsRequest.java @@ -389,7 +389,9 @@ protected static void setupPutDataStreamOptionsRequestDeserializer( StringBuilder buf = new StringBuilder(); buf.append("/_data_stream"); 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); buf.append("/_options"); return buf.toString(); } @@ -407,7 +409,8 @@ protected static void setupPutDataStreamOptionsRequestDeserializer( propsSet |= _name; 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; }, @@ -419,8 +422,8 @@ protected static void setupPutDataStreamOptionsRequestDeserializer( params.put("master_timeout", request.masterTimeout._toJsonString()); } 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.timeout != null) { params.put("timeout", request.timeout._toJsonString()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataStreamSettingsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataStreamSettingsRequest.java index e07ef4882e..ba767f8be6 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataStreamSettingsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataStreamSettingsRequest.java @@ -360,7 +360,9 @@ protected static JsonpDeserializer createPutDataSt StringBuilder buf = new StringBuilder(); buf.append("/_data_stream"); 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); buf.append("/_settings"); return buf.toString(); } @@ -378,7 +380,8 @@ protected static JsonpDeserializer createPutDataSt propsSet |= _name; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutIndicesSettingsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutIndicesSettingsRequest.java index c60f3e05fb..2d91ac917c 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutIndicesSettingsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutIndicesSettingsRequest.java @@ -611,7 +611,8 @@ protected static JsonpDeserializer createPutIndicesSe 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("/_settings"); return buf.toString(); } @@ -632,7 +633,8 @@ protected static JsonpDeserializer createPutIndicesSe 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; }, @@ -647,8 +649,8 @@ protected static JsonpDeserializer createPutIndicesSe params.put("flat_settings", String.valueOf(request.flatSettings)); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutMappingRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutMappingRequest.java index 6a6c214b03..e1dff5226c 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutMappingRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutMappingRequest.java @@ -1025,7 +1025,8 @@ protected static void setupPutMappingRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_mapping"); return buf.toString(); } @@ -1043,7 +1044,8 @@ protected static void setupPutMappingRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -1055,8 +1057,8 @@ protected static void setupPutMappingRequestDeserializer(ObjectDeserializer v.jsonValue()).collect(Collectors.joining(","))); + params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()) + .filter(Objects::nonNull).collect(Collectors.joining(","))); } if (request.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/RecoveryRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/RecoveryRequest.java index 33f5231059..f25bf21c39 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/RecoveryRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/RecoveryRequest.java @@ -406,7 +406,8 @@ public Builder rebuild() { 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("/_recovery"); return buf.toString(); } @@ -427,7 +428,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; }, @@ -439,8 +441,8 @@ public Builder rebuild() { params.put("detailed", String.valueOf(request.detailed)); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/RefreshRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/RefreshRequest.java index 287c86cf3a..b697567ebf 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/RefreshRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/RefreshRequest.java @@ -337,7 +337,8 @@ public Builder rebuild() { 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("/_refresh"); return buf.toString(); } @@ -358,7 +359,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; }, @@ -367,8 +369,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ReloadSearchAnalyzersRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ReloadSearchAnalyzersRequest.java index 3c80a529e9..c1c58f74e0 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ReloadSearchAnalyzersRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ReloadSearchAnalyzersRequest.java @@ -347,7 +347,8 @@ public Builder rebuild() { 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("/_reload_search_analyzers"); return buf.toString(); } @@ -365,7 +366,8 @@ public Builder rebuild() { propsSet |= _index; 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; }, @@ -374,8 +376,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/RemoveBlockRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/RemoveBlockRequest.java index 7ddcbfa3c4..5cea117469 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/RemoveBlockRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/RemoveBlockRequest.java @@ -446,7 +446,8 @@ public Builder rebuild() { if (propsSet == (_index | _block)) { 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("/_block"); buf.append("/"); SimpleEndpoint.pathEncode(request.block.jsonValue(), buf); @@ -468,7 +469,8 @@ public Builder rebuild() { propsSet |= _block; if (propsSet == (_index | _block)) { - 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(","))); params.put("block", request.block.jsonValue()); } return params; @@ -481,8 +483,8 @@ public Builder rebuild() { params.put("master_timeout", request.masterTimeout._toJsonString()); } 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ResolveClusterRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ResolveClusterRequest.java index 4b879891b4..48f01dfecb 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ResolveClusterRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ResolveClusterRequest.java @@ -528,7 +528,9 @@ public Builder rebuild() { buf.append("/_resolve"); buf.append("/cluster"); 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"); @@ -548,7 +550,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; }, @@ -557,8 +560,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ResolveIndexRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ResolveIndexRequest.java index 3ff879a60a..caba56120e 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ResolveIndexRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ResolveIndexRequest.java @@ -428,7 +428,9 @@ protected static void setupResolveIndexRequestDeserializer(ObjectDeserializer 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"); @@ -445,7 +447,8 @@ protected static void setupResolveIndexRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("name", request.name.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -454,11 +457,12 @@ protected static void setupResolveIndexRequestDeserializer(ObjectDeserializer { Map params = new HashMap<>(); if (ApiTypeHelper.isDefined(request.mode)) { - params.put("mode", request.mode.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("mode", request.mode.stream().map(v -> v.jsonValue()).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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/SegmentsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/SegmentsRequest.java index 6ca39147eb..a280938ed4 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/SegmentsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/SegmentsRequest.java @@ -316,7 +316,8 @@ public Builder rebuild() { 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("/_segments"); return buf.toString(); } @@ -337,7 +338,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; }, @@ -346,8 +348,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ShardStoresRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ShardStoresRequest.java index 7925300a71..0f7c9145c3 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ShardStoresRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ShardStoresRequest.java @@ -363,7 +363,8 @@ public Builder rebuild() { 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("/_shard_stores"); return buf.toString(); } @@ -384,7 +385,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; }, @@ -393,8 +395,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); @@ -403,8 +405,8 @@ public Builder rebuild() { params.put("allow_no_indices", String.valueOf(request.allowNoIndices)); } if (ApiTypeHelper.isDefined(request.status)) { - params.put("status", - request.status.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("status", request.status.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ValidateQueryRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ValidateQueryRequest.java index 5dcef5e170..f74980feb7 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ValidateQueryRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ValidateQueryRequest.java @@ -671,7 +671,8 @@ protected static void setupValidateQueryRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_validate"); buf.append("/query"); return buf.toString(); @@ -693,7 +694,8 @@ protected static void setupValidateQueryRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -717,8 +719,8 @@ protected static void setupValidateQueryRequestDeserializer(ObjectDeserializer v.jsonValue()).collect(Collectors.joining(","))); + params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()) + .filter(Objects::nonNull).collect(Collectors.joining(","))); } if (request.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/AmazonSageMakerElementType.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/AmazonSageMakerElementType.java deleted file mode 100644 index e6b07026be..0000000000 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/AmazonSageMakerElementType.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package co.elastic.clients.elasticsearch.inference; - -import co.elastic.clients.json.JsonEnum; -import co.elastic.clients.json.JsonpDeserializable; -import co.elastic.clients.json.JsonpDeserializer; - -//---------------------------------------------------------------- -// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST. -//---------------------------------------------------------------- -// -// This code is generated from the Elasticsearch API specification -// at https://github.com/elastic/elasticsearch-specification -// -// Manual updates to this file will be lost when the code is -// re-generated. -// -// If you find a property that is missing or wrongly typed, please -// open an issue or a PR on the API specification repository. -// -//---------------------------------------------------------------- - -/** - * - * @see API - * specification - */ -@JsonpDeserializable -public enum AmazonSageMakerElementType implements JsonEnum { - Byte("byte"), - - Float("float"), - - Bit("bit"), - - ; - - private final String jsonValue; - - AmazonSageMakerElementType(String jsonValue) { - this.jsonValue = jsonValue; - } - - public String jsonValue() { - return this.jsonValue; - } - - public static final JsonEnum.Deserializer _DESERIALIZER = new JsonEnum.Deserializer<>( - AmazonSageMakerElementType.values()); -} diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/AmazonSageMakerServiceSettings.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/AmazonSageMakerServiceSettings.java index c5f59b13a6..2c7821b296 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/AmazonSageMakerServiceSettings.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/AmazonSageMakerServiceSettings.java @@ -71,12 +71,6 @@ public class AmazonSageMakerServiceSettings implements JsonpSerializable { private final String secretKey; - @Nullable - private final AmazonSageMakerSimilarity similarity; - - @Nullable - private final AmazonSageMakerElementType elementType; - @Nullable private final String targetModel; @@ -101,8 +95,6 @@ private AmazonSageMakerServiceSettings(Builder builder) { this.api = ApiTypeHelper.requireNonNull(builder.api, this, "api"); this.region = ApiTypeHelper.requireNonNull(builder.region, this, "region"); this.secretKey = ApiTypeHelper.requireNonNull(builder.secretKey, this, "secretKey"); - this.similarity = builder.similarity; - this.elementType = builder.elementType; this.targetModel = builder.targetModel; this.targetContainerHostname = builder.targetContainerHostname; this.inferenceComponentName = builder.inferenceComponentName; @@ -168,31 +160,6 @@ public final String secretKey() { return this.secretKey; } - /** - * Required when api is elastic and task type is - * text_embedding. The similarity measure used when invoking the - * text_embedding task type. - *

- * API name: {@code similarity} - */ - @Nullable - public final AmazonSageMakerSimilarity similarity() { - return this.similarity; - } - - /** - * Required when api is elastic and task type is - * text_embedding. The data type returned by the text embedding - * model. This value is used when parsing the response back to Elasticsearch - * data structures. - *

- * API name: {@code element_type} - */ - @Nullable - public final AmazonSageMakerElementType elementType() { - return this.elementType; - } - /** * The model ID when calling a multi-model endpoint. *

@@ -273,14 +240,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { generator.writeKey("secret_key"); generator.write(this.secretKey); - if (this.similarity != null) { - generator.writeKey("similarity"); - this.similarity.serialize(generator, mapper); - } - if (this.elementType != null) { - generator.writeKey("element_type"); - this.elementType.serialize(generator, mapper); - } if (this.targetModel != null) { generator.writeKey("target_model"); generator.write(this.targetModel); @@ -333,12 +292,6 @@ public static class Builder extends WithJsonObjectBuilderBase private String secretKey; - @Nullable - private AmazonSageMakerSimilarity similarity; - - @Nullable - private AmazonSageMakerElementType elementType; - @Nullable private String targetModel; @@ -362,8 +315,6 @@ private Builder(AmazonSageMakerServiceSettings instance) { this.api = instance.api; this.region = instance.region; this.secretKey = instance.secretKey; - this.similarity = instance.similarity; - this.elementType = instance.elementType; this.targetModel = instance.targetModel; this.targetContainerHostname = instance.targetContainerHostname; this.inferenceComponentName = instance.inferenceComponentName; @@ -428,31 +379,6 @@ public final Builder secretKey(String value) { return this; } - /** - * Required when api is elastic and task type is - * text_embedding. The similarity measure used when invoking the - * text_embedding task type. - *

- * API name: {@code similarity} - */ - public final Builder similarity(@Nullable AmazonSageMakerSimilarity value) { - this.similarity = value; - return this; - } - - /** - * Required when api is elastic and task type is - * text_embedding. The data type returned by the text embedding - * model. This value is used when parsing the response back to Elasticsearch - * data structures. - *

- * API name: {@code element_type} - */ - public final Builder elementType(@Nullable AmazonSageMakerElementType value) { - this.elementType = value; - return this; - } - /** * The model ID when calling a multi-model endpoint. *

@@ -548,8 +474,6 @@ protected static void setupAmazonSageMakerServiceSettingsDeserializer( op.add(Builder::api, AmazonSageMakerApi._DESERIALIZER, "api"); op.add(Builder::region, JsonpDeserializer.stringDeserializer(), "region"); op.add(Builder::secretKey, JsonpDeserializer.stringDeserializer(), "secret_key"); - op.add(Builder::similarity, AmazonSageMakerSimilarity._DESERIALIZER, "similarity"); - op.add(Builder::elementType, AmazonSageMakerElementType._DESERIALIZER, "element_type"); op.add(Builder::targetModel, JsonpDeserializer.stringDeserializer(), "target_model"); op.add(Builder::targetContainerHostname, JsonpDeserializer.stringDeserializer(), "target_container_hostname"); op.add(Builder::inferenceComponentName, JsonpDeserializer.stringDeserializer(), "inference_component_name"); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/AmazonSageMakerSimilarity.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/AmazonSageMakerSimilarity.java deleted file mode 100644 index c03c411d02..0000000000 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/AmazonSageMakerSimilarity.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package co.elastic.clients.elasticsearch.inference; - -import co.elastic.clients.json.JsonEnum; -import co.elastic.clients.json.JsonpDeserializable; -import co.elastic.clients.json.JsonpDeserializer; - -//---------------------------------------------------------------- -// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST. -//---------------------------------------------------------------- -// -// This code is generated from the Elasticsearch API specification -// at https://github.com/elastic/elasticsearch-specification -// -// Manual updates to this file will be lost when the code is -// re-generated. -// -// If you find a property that is missing or wrongly typed, please -// open an issue or a PR on the API specification repository. -// -//---------------------------------------------------------------- - -/** - * - * @see API - * specification - */ -@JsonpDeserializable -public enum AmazonSageMakerSimilarity implements JsonEnum { - Cosine("cosine"), - - DotProduct("dot_product"), - - L2Norm("l2_norm"), - - ; - - private final String jsonValue; - - AmazonSageMakerSimilarity(String jsonValue) { - this.jsonValue = jsonValue; - } - - public String jsonValue() { - return this.jsonValue; - } - - public static final JsonEnum.Deserializer _DESERIALIZER = new JsonEnum.Deserializer<>( - AmazonSageMakerSimilarity.values()); -} diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DeleteGeoipDatabaseRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DeleteGeoipDatabaseRequest.java index 428288b74c..d1191b7fec 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DeleteGeoipDatabaseRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DeleteGeoipDatabaseRequest.java @@ -264,7 +264,9 @@ public Builder rebuild() { buf.append("/geoip"); buf.append("/database"); buf.append("/"); - SimpleEndpoint.pathEncode(request.id.stream().map(v -> v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode( + request.id.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")), + buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -281,7 +283,8 @@ public Builder rebuild() { propsSet |= _id; if (propsSet == (_id)) { - params.put("id", request.id.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("id", + request.id.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DeleteIpLocationDatabaseRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DeleteIpLocationDatabaseRequest.java index cbaa52382e..7b2d84bfec 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DeleteIpLocationDatabaseRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DeleteIpLocationDatabaseRequest.java @@ -269,7 +269,9 @@ public Builder rebuild() { buf.append("/ip_location"); buf.append("/database"); buf.append("/"); - SimpleEndpoint.pathEncode(request.id.stream().map(v -> v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode( + request.id.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")), + buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -286,7 +288,8 @@ public Builder rebuild() { propsSet |= _id; if (propsSet == (_id)) { - params.put("id", request.id.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("id", + request.id.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/GetGeoipDatabaseRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/GetGeoipDatabaseRequest.java index 9582307106..596c649ee8 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/GetGeoipDatabaseRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/GetGeoipDatabaseRequest.java @@ -199,7 +199,9 @@ public Builder rebuild() { buf.append("/geoip"); buf.append("/database"); buf.append("/"); - SimpleEndpoint.pathEncode(request.id.stream().map(v -> v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode( + request.id.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")), + buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -219,7 +221,8 @@ public Builder rebuild() { if (propsSet == 0) { } if (propsSet == (_id)) { - params.put("id", request.id.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("id", + request.id.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/GetIpLocationDatabaseRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/GetIpLocationDatabaseRequest.java index a1c6d4dd52..7bb67172cd 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/GetIpLocationDatabaseRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/GetIpLocationDatabaseRequest.java @@ -197,7 +197,9 @@ public Builder rebuild() { buf.append("/ip_location"); buf.append("/database"); buf.append("/"); - SimpleEndpoint.pathEncode(request.id.stream().map(v -> v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode( + request.id.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")), + buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -217,7 +219,8 @@ public Builder rebuild() { if (propsSet == 0) { } if (propsSet == (_id)) { - params.put("id", request.id.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("id", + request.id.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/GetPipelineRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/GetPipelineRequest.java index 205e19d840..f6cf096fe1 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/GetPipelineRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/GetPipelineRequest.java @@ -190,7 +190,9 @@ public Builder rebuild() { buf.append("/_logstash"); buf.append("/pipeline"); buf.append("/"); - SimpleEndpoint.pathEncode(request.id.stream().map(v -> v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode( + request.id.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")), + buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -210,7 +212,8 @@ public Builder rebuild() { if (propsSet == 0) { } if (propsSet == (_id)) { - params.put("id", request.id.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("id", + request.id.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DeleteCalendarJobRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DeleteCalendarJobRequest.java index 0ec186c950..0306143051 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DeleteCalendarJobRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DeleteCalendarJobRequest.java @@ -213,7 +213,8 @@ public Builder rebuild() { SimpleEndpoint.pathEncode(request.calendarId, buf); buf.append("/jobs"); buf.append("/"); - SimpleEndpoint.pathEncode(request.jobId.stream().map(v -> v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.jobId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -233,7 +234,8 @@ public Builder rebuild() { if (propsSet == (_calendarId | _jobId)) { params.put("calendarId", request.calendarId); - params.put("jobId", request.jobId.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("jobId", request.jobId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetDatafeedStatsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetDatafeedStatsRequest.java index 6239c9574a..f03d7ead75 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetDatafeedStatsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetDatafeedStatsRequest.java @@ -248,8 +248,8 @@ public Builder rebuild() { buf.append("/_ml"); buf.append("/datafeeds"); buf.append("/"); - SimpleEndpoint.pathEncode(request.datafeedId.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.datafeedId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_stats"); return buf.toString(); } @@ -275,7 +275,8 @@ public Builder rebuild() { propsSet |= _datafeedId; if (propsSet == (_datafeedId)) { - params.put("datafeedId", request.datafeedId.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("datafeedId", request.datafeedId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (propsSet == 0) { } diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetDatafeedsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetDatafeedsRequest.java index bfeb52ade1..5dd77d185c 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetDatafeedsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetDatafeedsRequest.java @@ -278,8 +278,8 @@ public Builder rebuild() { buf.append("/_ml"); buf.append("/datafeeds"); buf.append("/"); - SimpleEndpoint.pathEncode(request.datafeedId.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.datafeedId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } if (propsSet == 0) { @@ -303,7 +303,8 @@ public Builder rebuild() { propsSet |= _datafeedId; if (propsSet == (_datafeedId)) { - params.put("datafeedId", request.datafeedId.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("datafeedId", request.datafeedId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (propsSet == 0) { } diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetFiltersRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetFiltersRequest.java index 6741abfdad..553da620fe 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetFiltersRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetFiltersRequest.java @@ -246,8 +246,8 @@ public Builder rebuild() { buf.append("/_ml"); buf.append("/filters"); buf.append("/"); - SimpleEndpoint.pathEncode(request.filterId.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.filterId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -267,7 +267,8 @@ public Builder rebuild() { if (propsSet == 0) { } if (propsSet == (_filterId)) { - params.put("filterId", request.filterId.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("filterId", request.filterId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetJobsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetJobsRequest.java index 3db8edc4b3..20248a3c34 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetJobsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetJobsRequest.java @@ -274,7 +274,8 @@ public Builder rebuild() { buf.append("/_ml"); buf.append("/anomaly_detectors"); buf.append("/"); - SimpleEndpoint.pathEncode(request.jobId.stream().map(v -> v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.jobId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } if (propsSet == 0) { @@ -298,7 +299,8 @@ public Builder rebuild() { propsSet |= _jobId; if (propsSet == (_jobId)) { - params.put("jobId", request.jobId.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("jobId", request.jobId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (propsSet == 0) { } diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetTrainedModelsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetTrainedModelsRequest.java index 4885948641..d938f56462 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetTrainedModelsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetTrainedModelsRequest.java @@ -428,8 +428,8 @@ public Builder rebuild() { buf.append("/_ml"); buf.append("/trained_models"); buf.append("/"); - SimpleEndpoint.pathEncode(request.modelId.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.modelId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } if (propsSet == 0) { @@ -453,7 +453,8 @@ public Builder rebuild() { propsSet |= _modelId; if (propsSet == (_modelId)) { - params.put("modelId", request.modelId.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("modelId", request.modelId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (propsSet == 0) { } @@ -482,7 +483,8 @@ public Builder rebuild() { params.put("allow_no_match", String.valueOf(request.allowNoMatch)); } if (ApiTypeHelper.isDefined(request.tags)) { - params.put("tags", request.tags.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("tags", request.tags.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetTrainedModelsStatsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetTrainedModelsStatsRequest.java index e0258778b7..d6ce7d9bae 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetTrainedModelsStatsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/GetTrainedModelsStatsRequest.java @@ -291,8 +291,8 @@ public Builder rebuild() { buf.append("/_ml"); buf.append("/trained_models"); buf.append("/"); - SimpleEndpoint.pathEncode(request.modelId.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.modelId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_stats"); return buf.toString(); } @@ -318,7 +318,8 @@ public Builder rebuild() { propsSet |= _modelId; if (propsSet == (_modelId)) { - params.put("modelId", request.modelId.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("modelId", request.modelId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (propsSet == 0) { } diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutCalendarJobRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutCalendarJobRequest.java index 11ce0a38f2..fc33555466 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutCalendarJobRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutCalendarJobRequest.java @@ -213,7 +213,8 @@ public Builder rebuild() { SimpleEndpoint.pathEncode(request.calendarId, buf); buf.append("/jobs"); buf.append("/"); - SimpleEndpoint.pathEncode(request.jobId.stream().map(v -> v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.jobId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -233,7 +234,8 @@ public Builder rebuild() { if (propsSet == (_calendarId | _jobId)) { params.put("calendarId", request.calendarId); - params.put("jobId", request.jobId.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("jobId", request.jobId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutDatafeedRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutDatafeedRequest.java index 59eff3c4bf..487a950371 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutDatafeedRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutDatafeedRequest.java @@ -1199,8 +1199,8 @@ protected static void setupPutDatafeedRequestDeserializer(ObjectDeserializer { Map params = new HashMap<>(); 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutJobRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutJobRequest.java index cbd035c309..40a8a262d3 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutJobRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutJobRequest.java @@ -1091,8 +1091,8 @@ protected static void setupPutJobRequestDeserializer(ObjectDeserializer { Map params = new HashMap<>(); 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/UpdateDatafeedRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/UpdateDatafeedRequest.java index 1b54b67757..96cb00e290 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/UpdateDatafeedRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/UpdateDatafeedRequest.java @@ -1151,8 +1151,8 @@ protected static void setupUpdateDatafeedRequestDeserializer(ObjectDeserializer< request -> { Map params = new HashMap<>(); 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/ClearRepositoriesMeteringArchiveRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/ClearRepositoriesMeteringArchiveRequest.java index f141fa4914..0c25d60543 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/ClearRepositoriesMeteringArchiveRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/ClearRepositoriesMeteringArchiveRequest.java @@ -216,8 +216,8 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_nodes"); 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); buf.append("/_repositories_metering"); buf.append("/"); SimpleEndpoint.pathEncode(String.valueOf(request.maxArchiveVersion), buf); @@ -239,7 +239,8 @@ public Builder rebuild() { propsSet |= _nodeId; if (propsSet == (_nodeId | _maxArchiveVersion)) { - 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(","))); params.put("maxArchiveVersion", String.valueOf(request.maxArchiveVersion)); } return params; diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/GetRepositoriesMeteringInfoRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/GetRepositoriesMeteringInfoRequest.java index 32fb41ff1b..08a6cc2d8b 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/GetRepositoriesMeteringInfoRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/GetRepositoriesMeteringInfoRequest.java @@ -190,8 +190,8 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_nodes"); 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); buf.append("/_repositories_metering"); return buf.toString(); } @@ -209,7 +209,8 @@ public Builder rebuild() { propsSet |= _nodeId; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/HotThreadsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/HotThreadsRequest.java index a66401087c..bf4687be03 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/HotThreadsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/HotThreadsRequest.java @@ -414,8 +414,8 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_nodes"); 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); buf.append("/hot_threads"); return buf.toString(); } @@ -436,7 +436,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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodesInfoRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodesInfoRequest.java index 2d41a2f183..a81260d29e 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodesInfoRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodesInfoRequest.java @@ -305,27 +305,27 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_nodes"); 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(); } if (propsSet == (_metric)) { StringBuilder buf = new StringBuilder(); buf.append("/_nodes"); buf.append("/"); - SimpleEndpoint.pathEncode( - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } if (propsSet == (_nodeId | _metric)) { StringBuilder buf = new StringBuilder(); buf.append("/_nodes"); 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); buf.append("/"); - SimpleEndpoint.pathEncode( - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -348,16 +348,18 @@ 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(","))); } if (propsSet == (_metric)) { - params.put("metric", - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("metric", request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (propsSet == (_nodeId | _metric)) { - params.put("nodeId", request.nodeId.stream().map(v -> v).collect(Collectors.joining(","))); - params.put("metric", - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("nodeId", request.nodeId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); + params.put("metric", request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodesStatsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodesStatsRequest.java index 15a7c9e242..25cf3fe006 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodesStatsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodesStatsRequest.java @@ -610,8 +610,8 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_nodes"); 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); buf.append("/stats"); return buf.toString(); } @@ -620,20 +620,20 @@ public Builder rebuild() { buf.append("/_nodes"); buf.append("/stats"); buf.append("/"); - SimpleEndpoint.pathEncode( - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } if (propsSet == (_nodeId | _metric)) { StringBuilder buf = new StringBuilder(); buf.append("/_nodes"); 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); buf.append("/stats"); buf.append("/"); - SimpleEndpoint.pathEncode( - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } if (propsSet == (_metric | _indexMetric)) { @@ -641,26 +641,26 @@ public Builder rebuild() { buf.append("/_nodes"); buf.append("/stats"); buf.append("/"); - SimpleEndpoint.pathEncode( - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/"); - SimpleEndpoint.pathEncode( - request.indexMetric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.indexMetric.stream().map(v -> v.jsonValue()) + .filter(Objects::nonNull).collect(Collectors.joining(",")), buf); return buf.toString(); } if (propsSet == (_nodeId | _metric | _indexMetric)) { StringBuilder buf = new StringBuilder(); buf.append("/_nodes"); 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); buf.append("/stats"); buf.append("/"); - SimpleEndpoint.pathEncode( - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/"); - SimpleEndpoint.pathEncode( - request.indexMetric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.indexMetric.stream().map(v -> v.jsonValue()) + .filter(Objects::nonNull).collect(Collectors.joining(",")), buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -686,29 +686,32 @@ 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(","))); } if (propsSet == (_metric)) { - params.put("metric", - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("metric", request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (propsSet == (_nodeId | _metric)) { - params.put("nodeId", request.nodeId.stream().map(v -> v).collect(Collectors.joining(","))); - params.put("metric", - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("nodeId", request.nodeId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); + params.put("metric", request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (propsSet == (_metric | _indexMetric)) { - params.put("metric", - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); - params.put("indexMetric", - request.indexMetric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("metric", request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); + params.put("indexMetric", request.indexMetric.stream().map(v -> v.jsonValue()) + .filter(Objects::nonNull).collect(Collectors.joining(","))); } if (propsSet == (_nodeId | _metric | _indexMetric)) { - params.put("nodeId", request.nodeId.stream().map(v -> v).collect(Collectors.joining(","))); - params.put("metric", - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); - params.put("indexMetric", - request.indexMetric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("nodeId", request.nodeId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); + params.put("metric", request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); + params.put("indexMetric", request.indexMetric.stream().map(v -> v.jsonValue()) + .filter(Objects::nonNull).collect(Collectors.joining(","))); } return params; }, @@ -717,18 +720,19 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); if (ApiTypeHelper.isDefined(request.types)) { - params.put("types", request.types.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("types", request.types.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.level != null) { params.put("level", request.level.jsonValue()); } if (ApiTypeHelper.isDefined(request.completionFields)) { - params.put("completion_fields", - request.completionFields.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("completion_fields", request.completionFields.stream().map(v -> v) + .filter(Objects::nonNull).collect(Collectors.joining(","))); } if (ApiTypeHelper.isDefined(request.fielddataFields)) { - params.put("fielddata_fields", - request.fielddataFields.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("fielddata_fields", request.fielddataFields.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.groups != null) { params.put("groups", String.valueOf(request.groups)); @@ -737,7 +741,8 @@ public Builder rebuild() { params.put("include_unloaded_segments", String.valueOf(request.includeUnloadedSegments)); } if (ApiTypeHelper.isDefined(request.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(","))); } if (request.includeSegmentFileSizes != null) { params.put("include_segment_file_sizes", String.valueOf(request.includeSegmentFileSizes)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodesUsageRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodesUsageRequest.java index 3e6263eb70..54f88384f9 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodesUsageRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodesUsageRequest.java @@ -283,8 +283,8 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_nodes"); 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); buf.append("/usage"); return buf.toString(); } @@ -293,20 +293,20 @@ public Builder rebuild() { buf.append("/_nodes"); buf.append("/usage"); buf.append("/"); - SimpleEndpoint.pathEncode( - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } if (propsSet == (_nodeId | _metric)) { StringBuilder buf = new StringBuilder(); buf.append("/_nodes"); 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); buf.append("/usage"); buf.append("/"); - SimpleEndpoint.pathEncode( - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -329,16 +329,18 @@ 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(","))); } if (propsSet == (_metric)) { - params.put("metric", - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("metric", request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (propsSet == (_nodeId | _metric)) { - params.put("nodeId", request.nodeId.stream().map(v -> v).collect(Collectors.joining(","))); - params.put("metric", - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("nodeId", request.nodeId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); + params.put("metric", request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/ReloadSecureSettingsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/ReloadSecureSettingsRequest.java index 7251c45748..d3a282de20 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/ReloadSecureSettingsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/ReloadSecureSettingsRequest.java @@ -307,8 +307,8 @@ protected static void setupReloadSecureSettingsRequestDeserializer( StringBuilder buf = new StringBuilder(); buf.append("/_nodes"); 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); buf.append("/reload_secure_settings"); return buf.toString(); } @@ -329,7 +329,8 @@ protected static void setupReloadSecureSettingsRequestDeserializer( 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetRollupIndexCapsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetRollupIndexCapsRequest.java index 81b1d4fe88..8ba404c0f3 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetRollupIndexCapsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetRollupIndexCapsRequest.java @@ -194,7 +194,8 @@ public Builder rebuild() { 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("/_rollup"); buf.append("/data"); return buf.toString(); @@ -213,7 +214,8 @@ public Builder rebuild() { propsSet |= _index; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/RollupSearchRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/RollupSearchRequest.java index 146385f2d5..b8f5798601 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/RollupSearchRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/RollupSearchRequest.java @@ -434,7 +434,8 @@ protected static void setupRollupSearchRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_rollup_search"); return buf.toString(); } @@ -452,7 +453,8 @@ protected static void setupRollupSearchRequestDeserializer(ObjectDeserializer v).collect(Collectors.joining(","))); + params.put("index", request.index.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/GetBehavioralAnalyticsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/GetBehavioralAnalyticsRequest.java index ca87db04d5..69572f99ca 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/GetBehavioralAnalyticsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/GetBehavioralAnalyticsRequest.java @@ -190,7 +190,9 @@ public Builder rebuild() { buf.append("/_application"); buf.append("/analytics"); 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"); @@ -210,7 +212,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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/CacheStatsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/CacheStatsRequest.java index 47bc7b0fd0..bb6bb0cb98 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/CacheStatsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/CacheStatsRequest.java @@ -191,8 +191,8 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_searchable_snapshots"); 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); buf.append("/cache"); buf.append("/stats"); return buf.toString(); @@ -214,7 +214,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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ClearCacheRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ClearCacheRequest.java index 6b987ba524..d7164f1b37 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ClearCacheRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ClearCacheRequest.java @@ -312,7 +312,8 @@ public Builder rebuild() { 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("/_searchable_snapshots"); buf.append("/cache"); buf.append("/clear"); @@ -335,7 +336,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; }, @@ -344,8 +346,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); 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.ignoreUnavailable != null) { params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/SearchableSnapshotsStatsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/SearchableSnapshotsStatsRequest.java index bcffb71972..f4dcdad0dc 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/SearchableSnapshotsStatsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/SearchableSnapshotsStatsRequest.java @@ -218,7 +218,8 @@ public Builder rebuild() { 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("/_searchable_snapshots"); buf.append("/stats"); return buf.toString(); @@ -240,7 +241,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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearApiKeyCacheRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearApiKeyCacheRequest.java index 3635c04cb9..f0bb5d0f6f 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearApiKeyCacheRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearApiKeyCacheRequest.java @@ -190,7 +190,9 @@ public Builder rebuild() { buf.append("/_security"); buf.append("/api_key"); buf.append("/"); - SimpleEndpoint.pathEncode(request.ids.stream().map(v -> v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode( + request.ids.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")), + buf); buf.append("/_clear_cache"); return buf.toString(); } @@ -208,7 +210,8 @@ public Builder rebuild() { propsSet |= _ids; if (propsSet == (_ids)) { - params.put("ids", request.ids.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("ids", + request.ids.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedPrivilegesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedPrivilegesRequest.java index bc689328af..79ef3f59f0 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedPrivilegesRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedPrivilegesRequest.java @@ -191,8 +191,8 @@ public Builder rebuild() { buf.append("/_security"); buf.append("/privilege"); buf.append("/"); - SimpleEndpoint.pathEncode(request.application.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.application.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_clear_cache"); return buf.toString(); } @@ -210,8 +210,8 @@ public Builder rebuild() { propsSet |= _application; if (propsSet == (_application)) { - params.put("application", - request.application.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("application", request.application.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedRealmsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedRealmsRequest.java index 4f9facaae5..c7c7dd6b27 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedRealmsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedRealmsRequest.java @@ -235,8 +235,8 @@ public Builder rebuild() { buf.append("/_security"); buf.append("/realm"); buf.append("/"); - SimpleEndpoint.pathEncode(request.realms.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.realms.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_clear_cache"); return buf.toString(); } @@ -254,7 +254,8 @@ public Builder rebuild() { propsSet |= _realms; if (propsSet == (_realms)) { - params.put("realms", request.realms.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("realms", request.realms.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -263,7 +264,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); if (ApiTypeHelper.isDefined(request.usernames)) { - params.put("usernames", request.usernames.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("usernames", request.usernames.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedRolesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedRolesRequest.java index d58596295a..91ba66c1ba 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedRolesRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedRolesRequest.java @@ -189,7 +189,9 @@ public Builder rebuild() { buf.append("/_security"); buf.append("/role"); 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); buf.append("/_clear_cache"); return buf.toString(); } @@ -207,7 +209,8 @@ public Builder rebuild() { propsSet |= _name; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedServiceTokensRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedServiceTokensRequest.java index 7c41c3d513..62efc1de07 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedServiceTokensRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ClearCachedServiceTokensRequest.java @@ -264,7 +264,9 @@ public Builder rebuild() { buf.append("/credential"); buf.append("/token"); 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); buf.append("/_clear_cache"); return buf.toString(); } @@ -288,7 +290,8 @@ public Builder rebuild() { if (propsSet == (_namespace | _service | _name)) { params.put("namespace", request.namespace); params.put("service", request.service); - 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/DeletePrivilegesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/DeletePrivilegesRequest.java index 874124d3da..46133d5305 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/DeletePrivilegesRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/DeletePrivilegesRequest.java @@ -254,7 +254,9 @@ public Builder rebuild() { buf.append("/"); SimpleEndpoint.pathEncode(request.application, buf); 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"); @@ -274,7 +276,8 @@ public Builder rebuild() { if (propsSet == (_application | _name)) { params.put("application", request.application); - 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetPrivilegesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetPrivilegesRequest.java index c4b817bfc0..aa7f9cdd6a 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetPrivilegesRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetPrivilegesRequest.java @@ -244,7 +244,9 @@ public Builder rebuild() { buf.append("/"); SimpleEndpoint.pathEncode(request.application, buf); 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"); @@ -271,7 +273,8 @@ public Builder rebuild() { } if (propsSet == (_application | _name)) { params.put("application", request.application); - 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetRoleMappingRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetRoleMappingRequest.java index 1166418636..16e0572421 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetRoleMappingRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetRoleMappingRequest.java @@ -200,7 +200,9 @@ public Builder rebuild() { buf.append("/_security"); buf.append("/role_mapping"); 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(); } if (propsSet == 0) { @@ -224,7 +226,8 @@ public Builder rebuild() { propsSet |= _name; 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(","))); } if (propsSet == 0) { } diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetRoleRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetRoleRequest.java index bdb32455fd..3065bb88fe 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetRoleRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetRoleRequest.java @@ -190,7 +190,9 @@ public Builder rebuild() { buf.append("/_security"); buf.append("/role"); 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(); } if (propsSet == 0) { @@ -214,7 +216,8 @@ public Builder rebuild() { propsSet |= _name; 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(","))); } if (propsSet == 0) { } diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetUserProfileRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetUserProfileRequest.java index 5226350461..f17c481547 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetUserProfileRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetUserProfileRequest.java @@ -240,7 +240,9 @@ public Builder rebuild() { buf.append("/_security"); buf.append("/profile"); buf.append("/"); - SimpleEndpoint.pathEncode(request.uid.stream().map(v -> v).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode( + request.uid.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(",")), + buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -257,7 +259,8 @@ public Builder rebuild() { propsSet |= _uid; if (propsSet == (_uid)) { - params.put("uid", request.uid.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("uid", + request.uid.stream().map(v -> v).filter(Objects::nonNull).collect(Collectors.joining(","))); } return params; }, @@ -266,7 +269,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); if (ApiTypeHelper.isDefined(request.data)) { - params.put("data", request.data.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("data", request.data.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetUserRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetUserRequest.java index 621c37719f..d39d603a14 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetUserRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetUserRequest.java @@ -218,8 +218,8 @@ public Builder rebuild() { buf.append("/_security"); buf.append("/user"); buf.append("/"); - SimpleEndpoint.pathEncode(request.username.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.username.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } if (propsSet == 0) { @@ -243,7 +243,8 @@ public Builder rebuild() { propsSet |= _username; if (propsSet == (_username)) { - params.put("username", request.username.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("username", request.username.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (propsSet == 0) { } diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/GetNodeRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/GetNodeRequest.java index 5a6ec7c761..7d9c1bf7d4 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/GetNodeRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/GetNodeRequest.java @@ -236,8 +236,8 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_nodes"); 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); buf.append("/shutdown"); return buf.toString(); } @@ -258,7 +258,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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetLifecycleRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetLifecycleRequest.java index cf773740ea..4100b591a1 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetLifecycleRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetLifecycleRequest.java @@ -265,8 +265,8 @@ public Builder rebuild() { buf.append("/_slm"); buf.append("/policy"); buf.append("/"); - SimpleEndpoint.pathEncode(request.policyId.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.policyId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } if (propsSet == 0) { @@ -290,7 +290,8 @@ public Builder rebuild() { propsSet |= _policyId; if (propsSet == (_policyId)) { - params.put("policyId", request.policyId.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("policyId", request.policyId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (propsSet == 0) { } diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteRepositoryRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteRepositoryRequest.java index 0f313d5a82..b4bb2ba6e9 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteRepositoryRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteRepositoryRequest.java @@ -279,7 +279,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_snapshot"); 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"); @@ -296,7 +298,8 @@ public Builder rebuild() { propsSet |= _name; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteSnapshotRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteSnapshotRequest.java index 9135ff9c93..24b1fc7ff1 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteSnapshotRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteSnapshotRequest.java @@ -287,8 +287,8 @@ public Builder rebuild() { buf.append("/"); SimpleEndpoint.pathEncode(request.repository, buf); buf.append("/"); - SimpleEndpoint.pathEncode(request.snapshot.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.snapshot.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -308,7 +308,8 @@ public Builder rebuild() { if (propsSet == (_repository | _snapshot)) { params.put("repository", request.repository); - params.put("snapshot", request.snapshot.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("snapshot", request.snapshot.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetRepositoryRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetRepositoryRequest.java index 22632ceb71..24305301e7 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetRepositoryRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetRepositoryRequest.java @@ -275,7 +275,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_snapshot"); 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"); @@ -295,7 +297,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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetSnapshotRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetSnapshotRequest.java index 64d31b839f..160e765315 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetSnapshotRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetSnapshotRequest.java @@ -732,8 +732,8 @@ public Builder rebuild() { buf.append("/"); SimpleEndpoint.pathEncode(request.repository, buf); buf.append("/"); - SimpleEndpoint.pathEncode(request.snapshot.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.snapshot.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -753,7 +753,8 @@ public Builder rebuild() { if (propsSet == (_repository | _snapshot)) { params.put("repository", request.repository); - params.put("snapshot", request.snapshot.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("snapshot", request.snapshot.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, @@ -795,8 +796,8 @@ public Builder rebuild() { params.put("after", request.after); } if (ApiTypeHelper.isDefined(request.state)) { - params.put("state", - request.state.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("state", request.state.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.slmPolicyFilter != null) { params.put("slm_policy_filter", request.slmPolicyFilter); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RepositoryAnalyzeRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RepositoryAnalyzeRequest.java index 2cfb93f296..fdeb00df03 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RepositoryAnalyzeRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RepositoryAnalyzeRequest.java @@ -258,9 +258,6 @@ public class RepositoryAnalyzeRequest extends RequestBase { @Nullable private final Integer blobCount; - @Nullable - private final Boolean checkOverwriteProtection; - @Nullable private final Integer concurrency; @@ -301,7 +298,6 @@ public class RepositoryAnalyzeRequest extends RequestBase { private RepositoryAnalyzeRequest(Builder builder) { this.blobCount = builder.blobCount; - this.checkOverwriteProtection = builder.checkOverwriteProtection; this.concurrency = builder.concurrency; this.detailed = builder.detailed; this.earlyReadNodeCount = builder.earlyReadNodeCount; @@ -332,17 +328,6 @@ public final Integer blobCount() { return this.blobCount; } - /** - * Whether to run the overwrite protection check. For realistic experiments, - * leave this parameter unset. - *

- * API name: {@code check_overwrite_protection} - */ - @Nullable - public final Boolean checkOverwriteProtection() { - return this.checkOverwriteProtection; - } - /** * The number of operations to run concurrently during the test. For realistic * experiments, leave this parameter unset. @@ -493,9 +478,6 @@ public static class Builder extends RequestBase.AbstractBuilder @Nullable private Integer blobCount; - @Nullable - private Boolean checkOverwriteProtection; - @Nullable private Integer concurrency; @@ -535,7 +517,6 @@ public Builder() { } private Builder(RepositoryAnalyzeRequest instance) { this.blobCount = instance.blobCount; - this.checkOverwriteProtection = instance.checkOverwriteProtection; this.concurrency = instance.concurrency; this.detailed = instance.detailed; this.earlyReadNodeCount = instance.earlyReadNodeCount; @@ -561,17 +542,6 @@ public final Builder blobCount(@Nullable Integer value) { return this; } - /** - * Whether to run the overwrite protection check. For realistic experiments, - * leave this parameter unset. - *

- * API name: {@code check_overwrite_protection} - */ - public final Builder checkOverwriteProtection(@Nullable Boolean value) { - this.checkOverwriteProtection = value; - return this; - } - /** * The number of operations to run concurrently during the test. For realistic * experiments, leave this parameter unset. @@ -799,18 +769,33 @@ public Builder rebuild() { // Request parameters request -> { Map params = new HashMap<>(); + if (request.rareActionProbability != null) { + params.put("rare_action_probability", String.valueOf(request.rareActionProbability)); + } if (request.seed != null) { params.put("seed", String.valueOf(request.seed)); } + if (request.detailed != null) { + params.put("detailed", String.valueOf(request.detailed)); + } + if (request.maxBlobSize != null) { + params.put("max_blob_size", request.maxBlobSize); + } + if (request.earlyReadNodeCount != null) { + params.put("early_read_node_count", String.valueOf(request.earlyReadNodeCount)); + } if (request.blobCount != null) { params.put("blob_count", String.valueOf(request.blobCount)); } - if (request.checkOverwriteProtection != null) { - params.put("check_overwrite_protection", String.valueOf(request.checkOverwriteProtection)); + if (request.rarelyAbortWrites != null) { + params.put("rarely_abort_writes", String.valueOf(request.rarelyAbortWrites)); } if (request.maxTotalDataSize != null) { params.put("max_total_data_size", request.maxTotalDataSize); } + if (request.readNodeCount != null) { + params.put("read_node_count", String.valueOf(request.readNodeCount)); + } if (request.registerOperationCount != null) { params.put("register_operation_count", String.valueOf(request.registerOperationCount)); } @@ -820,24 +805,6 @@ public Builder rebuild() { if (request.concurrency != null) { params.put("concurrency", String.valueOf(request.concurrency)); } - if (request.rareActionProbability != null) { - params.put("rare_action_probability", String.valueOf(request.rareActionProbability)); - } - if (request.detailed != null) { - params.put("detailed", String.valueOf(request.detailed)); - } - if (request.maxBlobSize != null) { - params.put("max_blob_size", request.maxBlobSize); - } - if (request.earlyReadNodeCount != null) { - params.put("early_read_node_count", String.valueOf(request.earlyReadNodeCount)); - } - if (request.rarelyAbortWrites != null) { - params.put("rarely_abort_writes", String.valueOf(request.rarelyAbortWrites)); - } - if (request.readNodeCount != null) { - params.put("read_node_count", String.valueOf(request.readNodeCount)); - } return params; }, SimpleEndpoint.emptyMap(), false, RepositoryAnalyzeResponse._DESERIALIZER); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RepositoryVerifyIntegrityRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RepositoryVerifyIntegrityRequest.java index d6a614e0e1..36f4b0c1be 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RepositoryVerifyIntegrityRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RepositoryVerifyIntegrityRequest.java @@ -494,7 +494,9 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_snapshot"); 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); buf.append("/_verify_integrity"); return buf.toString(); } @@ -512,7 +514,8 @@ public Builder rebuild() { propsSet |= _name; 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; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/SnapshotStatusRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/SnapshotStatusRequest.java index 4b43bf5384..238638be2d 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/SnapshotStatusRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/SnapshotStatusRequest.java @@ -345,8 +345,8 @@ public Builder rebuild() { buf.append("/"); SimpleEndpoint.pathEncode(request.repository, buf); buf.append("/"); - SimpleEndpoint.pathEncode(request.snapshot.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.snapshot.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_status"); return buf.toString(); } @@ -374,7 +374,8 @@ public Builder rebuild() { } if (propsSet == (_repository | _snapshot)) { params.put("repository", request.repository); - params.put("snapshot", request.snapshot.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("snapshot", request.snapshot.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/tasks/CancelRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/tasks/CancelRequest.java index c679bb8df2..df02df50d9 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/tasks/CancelRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/tasks/CancelRequest.java @@ -362,13 +362,15 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); if (ApiTypeHelper.isDefined(request.nodes)) { - params.put("nodes", request.nodes.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("nodes", request.nodes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.parentTaskId != null) { params.put("parent_task_id", request.parentTaskId); } if (ApiTypeHelper.isDefined(request.actions)) { - params.put("actions", request.actions.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("actions", request.actions.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.waitForCompletion != null) { params.put("wait_for_completion", String.valueOf(request.waitForCompletion)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/tasks/ListRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/tasks/ListRequest.java index 02b32bd5b5..3e2b54c905 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/tasks/ListRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/tasks/ListRequest.java @@ -467,7 +467,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); if (ApiTypeHelper.isDefined(request.nodes)) { - params.put("nodes", request.nodes.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("nodes", request.nodes.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.parentTaskId != null) { params.put("parent_task_id", request.parentTaskId); @@ -479,7 +480,8 @@ public Builder rebuild() { params.put("group_by", request.groupBy.jsonValue()); } if (ApiTypeHelper.isDefined(request.actions)) { - params.put("actions", request.actions.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("actions", request.actions.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.waitForCompletion != null) { params.put("wait_for_completion", String.valueOf(request.waitForCompletion)); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/text_structure/FindFieldStructureRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/text_structure/FindFieldStructureRequest.java index 89e9b65f02..2ee04d003e 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/text_structure/FindFieldStructureRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/text_structure/FindFieldStructureRequest.java @@ -858,8 +858,8 @@ public Builder rebuild() { params.put("delimiter", request.delimiter); } if (ApiTypeHelper.isDefined(request.columnNames)) { - params.put("column_names", - request.columnNames.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("column_names", request.columnNames.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.documentsToSample != null) { params.put("documents_to_sample", request.documentsToSample.toString()); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/text_structure/FindMessageStructureRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/text_structure/FindMessageStructureRequest.java index 5cf3d469cc..ce44e68734 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/text_structure/FindMessageStructureRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/text_structure/FindMessageStructureRequest.java @@ -851,8 +851,8 @@ protected static void setupFindMessageStructureRequestDeserializer( params.put("format", request.format.jsonValue()); } if (ApiTypeHelper.isDefined(request.columnNames)) { - params.put("column_names", - request.columnNames.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("column_names", request.columnNames.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (request.timestampField != null) { params.put("timestamp_field", request.timestampField); diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/GetTransformRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/GetTransformRequest.java index c0f2f776bf..3e5ee217c4 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/GetTransformRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/GetTransformRequest.java @@ -330,8 +330,8 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_transform"); buf.append("/"); - SimpleEndpoint.pathEncode(request.transformId.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.transformId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } if (propsSet == 0) { @@ -354,8 +354,8 @@ public Builder rebuild() { propsSet |= _transformId; if (propsSet == (_transformId)) { - params.put("transformId", - request.transformId.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("transformId", request.transformId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } if (propsSet == 0) { } diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/GetTransformStatsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/GetTransformStatsRequest.java index a7e340528c..7c2be9d723 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/GetTransformStatsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/GetTransformStatsRequest.java @@ -335,8 +335,8 @@ public Builder rebuild() { StringBuilder buf = new StringBuilder(); buf.append("/_transform"); buf.append("/"); - SimpleEndpoint.pathEncode(request.transformId.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.transformId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); buf.append("/_stats"); return buf.toString(); } @@ -354,8 +354,8 @@ public Builder rebuild() { propsSet |= _transformId; if (propsSet == (_transformId)) { - params.put("transformId", - request.transformId.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("transformId", request.transformId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/Settings.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/Settings.java index 5f46e5cb82..05bb5b7313 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/Settings.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/Settings.java @@ -158,9 +158,7 @@ public final Float docsPerSecond() { * Defines the initial page size to use for the composite aggregation for each * checkpoint. If circuit breaker exceptions occur, the page size is dynamically * adjusted to a lower value. The minimum value is 10 and the - * maximum is 65,536. The default value is 500 for - * pivot transforms and 5000 for latest - * transforms. + * maximum is 65,536. *

* API name: {@code max_page_search_size} */ @@ -372,9 +370,7 @@ public final Builder docsPerSecond(@Nullable Float value) { * Defines the initial page size to use for the composite aggregation for each * checkpoint. If circuit breaker exceptions occur, the page size is dynamically * adjusted to a lower value. The minimum value is 10 and the - * maximum is 65,536. The default value is 500 for - * pivot transforms and 5000 for latest - * transforms. + * maximum is 65,536. *

* API name: {@code max_page_search_size} */ diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/AckWatchRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/AckWatchRequest.java index 782a632da9..47edd21fc8 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/AckWatchRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/AckWatchRequest.java @@ -239,8 +239,8 @@ public Builder rebuild() { SimpleEndpoint.pathEncode(request.watchId, buf); buf.append("/_ack"); buf.append("/"); - SimpleEndpoint.pathEncode(request.actionId.stream().map(v -> v).collect(Collectors.joining(",")), - buf); + SimpleEndpoint.pathEncode(request.actionId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -264,7 +264,8 @@ public Builder rebuild() { } if (propsSet == (_watchId | _actionId)) { params.put("watchId", request.watchId); - params.put("actionId", request.actionId.stream().map(v -> v).collect(Collectors.joining(","))); + params.put("actionId", request.actionId.stream().map(v -> v).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/WatcherStatsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/WatcherStatsRequest.java index 58b5d0c866..3ca93f523a 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/WatcherStatsRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/WatcherStatsRequest.java @@ -219,8 +219,8 @@ public Builder rebuild() { buf.append("/_watcher"); buf.append("/stats"); buf.append("/"); - SimpleEndpoint.pathEncode( - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")), buf); + SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(",")), buf); return buf.toString(); } throw SimpleEndpoint.noPathTemplateFound("path"); @@ -240,8 +240,8 @@ public Builder rebuild() { if (propsSet == 0) { } if (propsSet == (_metric)) { - params.put("metric", - request.metric.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("metric", request.metric.stream().map(v -> v.jsonValue()).filter(Objects::nonNull) + .collect(Collectors.joining(","))); } return params; }, diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/xpack/XpackInfoRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/xpack/XpackInfoRequest.java index 76f08f93c6..237316cca9 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/xpack/XpackInfoRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/xpack/XpackInfoRequest.java @@ -259,8 +259,8 @@ public Builder rebuild() { request -> { Map params = new HashMap<>(); if (ApiTypeHelper.isDefined(request.categories)) { - params.put("categories", - request.categories.stream().map(v -> v.jsonValue()).collect(Collectors.joining(","))); + params.put("categories", request.categories.stream().map(v -> v.jsonValue()) + .filter(Objects::nonNull).collect(Collectors.joining(","))); } if (request.human != null) { params.put("human", String.valueOf(request.human));