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 9c8579b504..41cfdb8462 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 @@ -148,8 +148,8 @@ public final Time masterTimeout() { } /** - * Comma-separated list of component template names used to limit the request. - * Wildcard (*) expressions are supported. + * Name of component template to retrieve. Wildcard (*) expressions + * are supported. *

* API name: {@code name} */ @@ -252,8 +252,8 @@ public final Builder masterTimeout(Function> f } /** - * Comma-separated list of component template names used to limit the request. - * Wildcard (*) expressions are supported. + * Name of component template to retrieve. Wildcard (*) expressions + * are supported. *

* API name: {@code name} */ 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 7fa10c82aa..7200e95469 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 @@ -1235,7 +1235,7 @@ 'cluster.delete_component_template.Response': 'cluster/delete_component_template/ClusterDeleteComponentTemplateResponse.ts#L22-L24', 'cluster.delete_voting_config_exclusions.Request': 'cluster/delete_voting_config_exclusions/ClusterDeleteVotingConfigExclusionsRequest.ts#L24-L57', 'cluster.exists_component_template.Request': 'cluster/exists_component_template/ClusterComponentTemplateExistsRequest.ts#L24-L64', -'cluster.get_component_template.Request': 'cluster/get_component_template/ClusterGetComponentTemplateRequest.ts#L24-L84', +'cluster.get_component_template.Request': 'cluster/get_component_template/ClusterGetComponentTemplateRequest.ts#L24-L81', 'cluster.get_component_template.Response': 'cluster/get_component_template/ClusterGetComponentTemplateResponse.ts#L22-L24', 'cluster.get_settings.Request': 'cluster/get_settings/ClusterGetSettingsRequest.ts#L24-L71', 'cluster.get_settings.Response': 'cluster/get_settings/ClusterGetSettingsResponse.ts#L23-L32', @@ -1732,8 +1732,8 @@ 'indices.put_data_stream_settings.Request': 'indices/put_data_stream_settings/IndicesPutDataStreamSettingsRequest.ts#L25-L78', 'indices.put_data_stream_settings.Response': 'indices/put_data_stream_settings/IndicesPutDataStreamSettingsResponse.ts#L23-L28', 'indices.put_data_stream_settings.UpdatedDataStreamSettings': 'indices/put_data_stream_settings/IndicesPutDataStreamSettingsResponse.ts#L30-L55', -'indices.put_index_template.IndexTemplateMapping': 'indices/put_index_template/IndicesPutIndexTemplateRequest.ts#L165-L187', -'indices.put_index_template.Request': 'indices/put_index_template/IndicesPutIndexTemplateRequest.ts#L38-L163', +'indices.put_index_template.IndexTemplateMapping': 'indices/put_index_template/IndicesPutIndexTemplateRequest.ts#L166-L193', +'indices.put_index_template.Request': 'indices/put_index_template/IndicesPutIndexTemplateRequest.ts#L39-L164', 'indices.put_index_template.Response': 'indices/put_index_template/IndicesPutIndexTemplateResponse.ts#L22-L24', 'indices.put_mapping.Request': 'indices/put_mapping/IndicesPutMappingRequest.ts#L42-L187', 'indices.put_mapping.Response': 'indices/put_mapping/IndicesPutMappingResponse.ts#L22-L24', @@ -1965,8 +1965,8 @@ 'inference._types.VoyageAITaskSettings': 'inference/_types/CommonTypes.ts#L1623-L1647', 'inference._types.VoyageAITaskType': 'inference/_types/CommonTypes.ts#L1649-L1652', 'inference._types.WatsonxServiceSettings': 'inference/_types/CommonTypes.ts#L1658-L1695', -'inference._types.WatsonxServiceType': 'inference/_types/CommonTypes.ts#L1701-L1703', -'inference._types.WatsonxTaskType': 'inference/_types/CommonTypes.ts#L1697-L1699', +'inference._types.WatsonxServiceType': 'inference/_types/CommonTypes.ts#L1702-L1704', +'inference._types.WatsonxTaskType': 'inference/_types/CommonTypes.ts#L1697-L1700', '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-L24', 'inference.completion.Request': 'inference/completion/CompletionRequest.ts#L25-L65', @@ -2027,78 +2027,78 @@ 'inference.text_embedding.Response': 'inference/text_embedding/TextEmbeddingResponse.ts#L22-L24', 'inference.update.Request': 'inference/update/UpdateInferenceRequest.ts#L25-L63', 'inference.update.Response': 'inference/update/UpdateInferenceResponse.ts#L22-L24', -'ingest._types.AppendProcessor': 'ingest/_types/Processors.ts#L328-L343', -'ingest._types.AttachmentProcessor': 'ingest/_types/Processors.ts#L345-L386', -'ingest._types.BytesProcessor': 'ingest/_types/Processors.ts#L555-L571', -'ingest._types.CircleProcessor': 'ingest/_types/Processors.ts#L573-L596', -'ingest._types.CommunityIDProcessor': 'ingest/_types/Processors.ts#L598-L659', -'ingest._types.ConvertProcessor': 'ingest/_types/Processors.ts#L672-L692', -'ingest._types.ConvertType': 'ingest/_types/Processors.ts#L661-L670', -'ingest._types.CsvProcessor': 'ingest/_types/Processors.ts#L694-L727', +'ingest._types.AppendProcessor': 'ingest/_types/Processors.ts#L328-L350', +'ingest._types.AttachmentProcessor': 'ingest/_types/Processors.ts#L352-L393', +'ingest._types.BytesProcessor': 'ingest/_types/Processors.ts#L562-L578', +'ingest._types.CircleProcessor': 'ingest/_types/Processors.ts#L580-L603', +'ingest._types.CommunityIDProcessor': 'ingest/_types/Processors.ts#L605-L666', +'ingest._types.ConvertProcessor': 'ingest/_types/Processors.ts#L679-L699', +'ingest._types.ConvertType': 'ingest/_types/Processors.ts#L668-L677', +'ingest._types.CsvProcessor': 'ingest/_types/Processors.ts#L701-L734', 'ingest._types.DatabaseConfiguration': 'ingest/_types/Database.ts#L22-L37', 'ingest._types.DatabaseConfigurationFull': 'ingest/_types/Database.ts#L39-L53', -'ingest._types.DateIndexNameProcessor': 'ingest/_types/Processors.ts#L729-L767', -'ingest._types.DateProcessor': 'ingest/_types/Processors.ts#L769-L802', -'ingest._types.DissectProcessor': 'ingest/_types/Processors.ts#L804-L823', +'ingest._types.DateIndexNameProcessor': 'ingest/_types/Processors.ts#L736-L774', +'ingest._types.DateProcessor': 'ingest/_types/Processors.ts#L776-L809', +'ingest._types.DissectProcessor': 'ingest/_types/Processors.ts#L811-L830', 'ingest._types.Document': 'ingest/_types/Simulation.ts#L69-L83', 'ingest._types.DocumentSimulation': 'ingest/_types/Simulation.ts#L85-L115', -'ingest._types.DotExpanderProcessor': 'ingest/_types/Processors.ts#L825-L843', -'ingest._types.DropProcessor': 'ingest/_types/Processors.ts#L845-L845', -'ingest._types.EnrichProcessor': 'ingest/_types/Processors.ts#L847-L886', -'ingest._types.FailProcessor': 'ingest/_types/Processors.ts#L888-L894', -'ingest._types.FingerprintDigest': 'ingest/_types/Processors.ts#L896-L902', -'ingest._types.FingerprintProcessor': 'ingest/_types/Processors.ts#L904-L932', -'ingest._types.ForeachProcessor': 'ingest/_types/Processors.ts#L934-L948', -'ingest._types.GeoGridProcessor': 'ingest/_types/Processors.ts#L388-L429', -'ingest._types.GeoGridTargetFormat': 'ingest/_types/Processors.ts#L437-L440', -'ingest._types.GeoGridTileType': 'ingest/_types/Processors.ts#L431-L435', -'ingest._types.GeoIpProcessor': 'ingest/_types/Processors.ts#L442-L476', -'ingest._types.GrokProcessor': 'ingest/_types/Processors.ts#L950-L981', -'ingest._types.GsubProcessor': 'ingest/_types/Processors.ts#L983-L1007', -'ingest._types.HtmlStripProcessor': 'ingest/_types/Processors.ts#L1009-L1025', -'ingest._types.InferenceConfig': 'ingest/_types/Processors.ts#L1066-L1078', -'ingest._types.InferenceConfigClassification': 'ingest/_types/Processors.ts#L1093-L1119', -'ingest._types.InferenceConfigRegression': 'ingest/_types/Processors.ts#L1080-L1091', -'ingest._types.InferenceProcessor': 'ingest/_types/Processors.ts#L1027-L1059', +'ingest._types.DotExpanderProcessor': 'ingest/_types/Processors.ts#L832-L850', +'ingest._types.DropProcessor': 'ingest/_types/Processors.ts#L852-L852', +'ingest._types.EnrichProcessor': 'ingest/_types/Processors.ts#L854-L893', +'ingest._types.FailProcessor': 'ingest/_types/Processors.ts#L895-L901', +'ingest._types.FingerprintDigest': 'ingest/_types/Processors.ts#L903-L909', +'ingest._types.FingerprintProcessor': 'ingest/_types/Processors.ts#L911-L939', +'ingest._types.ForeachProcessor': 'ingest/_types/Processors.ts#L941-L955', +'ingest._types.GeoGridProcessor': 'ingest/_types/Processors.ts#L395-L436', +'ingest._types.GeoGridTargetFormat': 'ingest/_types/Processors.ts#L444-L447', +'ingest._types.GeoGridTileType': 'ingest/_types/Processors.ts#L438-L442', +'ingest._types.GeoIpProcessor': 'ingest/_types/Processors.ts#L449-L483', +'ingest._types.GrokProcessor': 'ingest/_types/Processors.ts#L957-L988', +'ingest._types.GsubProcessor': 'ingest/_types/Processors.ts#L990-L1014', +'ingest._types.HtmlStripProcessor': 'ingest/_types/Processors.ts#L1016-L1032', +'ingest._types.InferenceConfig': 'ingest/_types/Processors.ts#L1073-L1085', +'ingest._types.InferenceConfigClassification': 'ingest/_types/Processors.ts#L1100-L1126', +'ingest._types.InferenceConfigRegression': 'ingest/_types/Processors.ts#L1087-L1098', +'ingest._types.InferenceProcessor': 'ingest/_types/Processors.ts#L1034-L1066', 'ingest._types.Ingest': 'ingest/_types/Simulation.ts#L28-L36', -'ingest._types.InputConfig': 'ingest/_types/Processors.ts#L1061-L1064', -'ingest._types.IpLocationProcessor': 'ingest/_types/Processors.ts#L478-L512', +'ingest._types.InputConfig': 'ingest/_types/Processors.ts#L1068-L1071', +'ingest._types.IpLocationProcessor': 'ingest/_types/Processors.ts#L485-L519', 'ingest._types.Ipinfo': 'ingest/_types/Database.ts#L59-L59', -'ingest._types.JoinProcessor': 'ingest/_types/Processors.ts#L1121-L1136', -'ingest._types.JsonProcessor': 'ingest/_types/Processors.ts#L1138-L1167', -'ingest._types.JsonProcessorConflictStrategy': 'ingest/_types/Processors.ts#L1169-L1174', -'ingest._types.KeyValueProcessor': 'ingest/_types/Processors.ts#L1176-L1228', +'ingest._types.JoinProcessor': 'ingest/_types/Processors.ts#L1128-L1143', +'ingest._types.JsonProcessor': 'ingest/_types/Processors.ts#L1145-L1174', +'ingest._types.JsonProcessorConflictStrategy': 'ingest/_types/Processors.ts#L1176-L1181', +'ingest._types.KeyValueProcessor': 'ingest/_types/Processors.ts#L1183-L1235', 'ingest._types.Local': 'ingest/_types/Database.ts#L63-L65', -'ingest._types.LowercaseProcessor': 'ingest/_types/Processors.ts#L1230-L1246', +'ingest._types.LowercaseProcessor': 'ingest/_types/Processors.ts#L1237-L1253', 'ingest._types.Maxmind': 'ingest/_types/Database.ts#L55-L57', -'ingest._types.NetworkDirectionProcessor': 'ingest/_types/Processors.ts#L1248-L1282', +'ingest._types.NetworkDirectionProcessor': 'ingest/_types/Processors.ts#L1255-L1289', 'ingest._types.Pipeline': 'ingest/_types/Pipeline.ts#L23-L51', 'ingest._types.PipelineConfig': 'ingest/_types/Pipeline.ts#L67-L81', -'ingest._types.PipelineProcessor': 'ingest/_types/Processors.ts#L1284-L1295', +'ingest._types.PipelineProcessor': 'ingest/_types/Processors.ts#L1291-L1302', 'ingest._types.PipelineProcessorResult': 'ingest/_types/Simulation.ts#L59-L67', 'ingest._types.PipelineSimulationStatusOptions': 'ingest/_types/Simulation.ts#L51-L57', 'ingest._types.ProcessorBase': 'ingest/_types/Processors.ts#L303-L326', 'ingest._types.ProcessorContainer': 'ingest/_types/Processors.ts#L27-L301', 'ingest._types.Redact': 'ingest/_types/Simulation.ts#L38-L43', -'ingest._types.RedactProcessor': 'ingest/_types/Processors.ts#L1297-L1338', -'ingest._types.RegisteredDomainProcessor': 'ingest/_types/Processors.ts#L1340-L1356', -'ingest._types.RemoveProcessor': 'ingest/_types/Processors.ts#L1358-L1372', -'ingest._types.RenameProcessor': 'ingest/_types/Processors.ts#L1374-L1390', -'ingest._types.RerouteProcessor': 'ingest/_types/Processors.ts#L1392-L1420', -'ingest._types.ScriptProcessor': 'ingest/_types/Processors.ts#L1422-L1442', -'ingest._types.SetProcessor': 'ingest/_types/Processors.ts#L1444-L1478', -'ingest._types.SetSecurityUserProcessor': 'ingest/_types/Processors.ts#L1480-L1489', -'ingest._types.ShapeType': 'ingest/_types/Processors.ts#L1491-L1494', +'ingest._types.RedactProcessor': 'ingest/_types/Processors.ts#L1304-L1345', +'ingest._types.RegisteredDomainProcessor': 'ingest/_types/Processors.ts#L1347-L1363', +'ingest._types.RemoveProcessor': 'ingest/_types/Processors.ts#L1365-L1379', +'ingest._types.RenameProcessor': 'ingest/_types/Processors.ts#L1381-L1397', +'ingest._types.RerouteProcessor': 'ingest/_types/Processors.ts#L1399-L1427', +'ingest._types.ScriptProcessor': 'ingest/_types/Processors.ts#L1429-L1449', +'ingest._types.SetProcessor': 'ingest/_types/Processors.ts#L1451-L1486', +'ingest._types.SetSecurityUserProcessor': 'ingest/_types/Processors.ts#L1488-L1497', +'ingest._types.ShapeType': 'ingest/_types/Processors.ts#L1499-L1502', 'ingest._types.SimulateDocumentResult': 'ingest/_types/Simulation.ts#L45-L49', -'ingest._types.SortProcessor': 'ingest/_types/Processors.ts#L1496-L1512', -'ingest._types.SplitProcessor': 'ingest/_types/Processors.ts#L1514-L1539', -'ingest._types.TerminateProcessor': 'ingest/_types/Processors.ts#L1541-L1541', -'ingest._types.TrimProcessor': 'ingest/_types/Processors.ts#L1543-L1559', -'ingest._types.UppercaseProcessor': 'ingest/_types/Processors.ts#L1561-L1577', -'ingest._types.UriPartsProcessor': 'ingest/_types/Processors.ts#L1597-L1623', -'ingest._types.UrlDecodeProcessor': 'ingest/_types/Processors.ts#L1579-L1595', -'ingest._types.UserAgentProcessor': 'ingest/_types/Processors.ts#L514-L545', -'ingest._types.UserAgentProperty': 'ingest/_types/Processors.ts#L547-L553', +'ingest._types.SortProcessor': 'ingest/_types/Processors.ts#L1504-L1520', +'ingest._types.SplitProcessor': 'ingest/_types/Processors.ts#L1522-L1547', +'ingest._types.TerminateProcessor': 'ingest/_types/Processors.ts#L1549-L1549', +'ingest._types.TrimProcessor': 'ingest/_types/Processors.ts#L1551-L1567', +'ingest._types.UppercaseProcessor': 'ingest/_types/Processors.ts#L1569-L1585', +'ingest._types.UriPartsProcessor': 'ingest/_types/Processors.ts#L1605-L1631', +'ingest._types.UrlDecodeProcessor': 'ingest/_types/Processors.ts#L1587-L1603', +'ingest._types.UserAgentProcessor': 'ingest/_types/Processors.ts#L521-L552', +'ingest._types.UserAgentProperty': 'ingest/_types/Processors.ts#L554-L560', 'ingest._types.Web': 'ingest/_types/Database.ts#L61-L61', 'ingest.delete_geoip_database.Request': 'ingest/delete_geoip_database/DeleteGeoipDatabaseRequest.ts#L24-L58', 'ingest.delete_geoip_database.Response': 'ingest/delete_geoip_database/DeleteGeoipDatabaseResponse.ts#L22-L24', @@ -3376,10 +3376,10 @@ if (hash.length > 1) { hash = hash.substring(1); } - window.location = "https://github.com/elastic/elasticsearch-specification/tree/1c755b6fc50623dce6993efb7bfd3bdaef68fb90/specification/" + (paths[hash] || ""); + window.location = "https://github.com/elastic/elasticsearch-specification/tree/63643aec35fb96af6faf0b40db27568dbecb4138/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/indices/ForcemergeRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ForcemergeRequest.java index f6779ad8f0..4cfba1ffae 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 @@ -234,7 +234,7 @@ public final List index() { } /** - * The number of segments the index should be merged into (defayult: dynamic) + * The number of segments the index should be merged into (default: dynamic) *

* API name: {@code max_num_segments} */ @@ -382,7 +382,7 @@ public final Builder index(String value, String... values) { } /** - * The number of segments the index should be merged into (defayult: dynamic) + * The number of segments the index should be merged into (default: dynamic) *

* API name: {@code max_num_segments} */ diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/IndexTemplate.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/IndexTemplate.java index ce5ab90a07..f27baab8de 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/IndexTemplate.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/IndexTemplate.java @@ -112,7 +112,8 @@ public static IndexTemplate of(Function> f } /** - * Required - Name of the index template. + * Required - Array of wildcard (*) expressions used to match the + * names of data streams and indices during creation. *

* API name: {@code index_patterns} */ @@ -344,7 +345,8 @@ public static class Builder extends WithJsonObjectBuilderBase implement private List ignoreMissingComponentTemplates; /** - * Required - Name of the index template. + * Required - Array of wildcard (*) expressions used to match the + * names of data streams and indices during creation. *

* API name: {@code index_patterns} *

@@ -356,7 +358,8 @@ public final Builder indexPatterns(List list) { } /** - * Required - Name of the index template. + * Required - Array of wildcard (*) expressions used to match the + * names of data streams and indices during creation. *

* API name: {@code index_patterns} *

diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutIndexTemplateRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutIndexTemplateRequest.java index 12ccb5754d..1c216a3d8f 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutIndexTemplateRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutIndexTemplateRequest.java @@ -267,7 +267,8 @@ public final List ignoreMissingComponentTemplates() { } /** - * Name of the index template to create. + * Array of wildcard (*) expressions used to match the names of + * data streams and indices during creation. *

* API name: {@code index_patterns} */ @@ -626,7 +627,8 @@ public final Builder ignoreMissingComponentTemplates(String value, String... val } /** - * Name of the index template to create. + * Array of wildcard (*) expressions used to match the names of + * data streams and indices during creation. *

* API name: {@code index_patterns} *

@@ -638,7 +640,8 @@ public final Builder indexPatterns(List list) { } /** - * Name of the index template to create. + * Array of wildcard (*) expressions used to match the names of + * data streams and indices during creation. *

* API name: {@code index_patterns} *

diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/put_index_template/IndexTemplateMapping.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/put_index_template/IndexTemplateMapping.java index b229239198..fa8cb1956f 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/put_index_template/IndexTemplateMapping.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/put_index_template/IndexTemplateMapping.java @@ -22,6 +22,7 @@ import co.elastic.clients.elasticsearch._types.mapping.TypeMapping; import co.elastic.clients.elasticsearch.indices.Alias; import co.elastic.clients.elasticsearch.indices.DataStreamLifecycle; +import co.elastic.clients.elasticsearch.indices.DataStreamOptionsTemplate; import co.elastic.clients.elasticsearch.indices.IndexSettings; import co.elastic.clients.json.JsonpDeserializable; import co.elastic.clients.json.JsonpDeserializer; @@ -76,6 +77,9 @@ public class IndexTemplateMapping implements JsonpSerializable { @Nullable private final DataStreamLifecycle lifecycle; + @Nullable + private final DataStreamOptionsTemplate dataStreamOptions; + // --------------------------------------------------------------------------------------------- private IndexTemplateMapping(Builder builder) { @@ -84,6 +88,7 @@ private IndexTemplateMapping(Builder builder) { this.mappings = builder.mappings; this.settings = builder.settings; this.lifecycle = builder.lifecycle; + this.dataStreamOptions = builder.dataStreamOptions; } @@ -132,6 +137,14 @@ public final DataStreamLifecycle lifecycle() { return this.lifecycle; } + /** + * API name: {@code data_stream_options} + */ + @Nullable + public final DataStreamOptionsTemplate dataStreamOptions() { + return this.dataStreamOptions; + } + /** * Serialize this object to JSON. */ @@ -169,6 +182,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { this.lifecycle.serialize(generator, mapper); } + if (this.dataStreamOptions != null) { + generator.writeKey("data_stream_options"); + this.dataStreamOptions.serialize(generator, mapper); + + } } @@ -198,6 +216,9 @@ public static class Builder extends WithJsonObjectBuilderBase @Nullable private DataStreamLifecycle lifecycle; + @Nullable + private DataStreamOptionsTemplate dataStreamOptions; + /** * Aliases to add. If the index template includes a data_stream * object, these are data stream aliases. Otherwise, these are index aliases. @@ -297,6 +318,22 @@ public final Builder lifecycle(Function> fn) { + return this.dataStreamOptions(fn.apply(new DataStreamOptionsTemplate.Builder()).build()); + } + @Override protected Builder self() { return this; @@ -329,6 +366,7 @@ protected static void setupIndexTemplateMappingDeserializer(ObjectDeserializer inference( *

  • OpenAI (chat_completion, completion, * text_embedding)
    • *
  • VoyageAI (rerank, text_embedding)
    • - *
  • Watsonx inference integration (text_embedding)
    • + *
  • Watsonx (rerank, text_embedding)
    • * * * @see put(PutRequest request) { *
  • OpenAI (chat_completion, completion, * text_embedding)
    • *
  • VoyageAI (rerank, text_embedding)
    • - *
  • Watsonx inference integration (text_embedding)
    • + *
  • Watsonx (rerank, text_embedding)
    • * * * @param fn diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/ElasticsearchInferenceClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/ElasticsearchInferenceClient.java index b69bb0f1c2..a6b2bd03eb 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/ElasticsearchInferenceClient.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/ElasticsearchInferenceClient.java @@ -364,7 +364,7 @@ public final InferenceResponse inference(FunctionOpenAI (chat_completion, completion, * text_embedding) *
  • VoyageAI (rerank, text_embedding)
    • - *
  • Watsonx inference integration (text_embedding)
    • + *
  • Watsonx (rerank, text_embedding)
    • * * * @see     OpenAI (chat_completion, completion, * text_embedding) *
  • VoyageAI (rerank, text_embedding)
    • - *
  • Watsonx inference integration (text_embedding)
    • + *
  • Watsonx (rerank, text_embedding)
    • * * * @param fn diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/PutRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/PutRequest.java index c1264f680c..dfb7fddc0b 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/PutRequest.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/PutRequest.java @@ -105,7 +105,7 @@ *
  • OpenAI (chat_completion, completion, * text_embedding)
    • *
  • VoyageAI (rerank, text_embedding)
    • - *
  • Watsonx inference integration (text_embedding)
    • + *
  • Watsonx (rerank, text_embedding)
    • * * * @see     API diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/WatsonxTaskType.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/WatsonxTaskType.java index 7c69f0e5b0..818a34e9a9 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/WatsonxTaskType.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/WatsonxTaskType.java @@ -48,6 +48,8 @@ public enum WatsonxTaskType implements JsonEnum { TextEmbedding("text_embedding"), + Rerank("rerank"), + ; private final String jsonValue; diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/AppendProcessor.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/AppendProcessor.java index 3f12acfeca..78c159acfe 100644 --- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/AppendProcessor.java +++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/AppendProcessor.java @@ -63,6 +63,9 @@ public class AppendProcessor extends ProcessorBase implements ProcessorVariant { private final List value; + @Nullable + private final String mediaType; + @Nullable private final Boolean allowDuplicates; @@ -72,7 +75,8 @@ private AppendProcessor(Builder builder) { super(builder); this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field"); - this.value = ApiTypeHelper.unmodifiableRequired(builder.value, this, "value"); + this.value = ApiTypeHelper.unmodifiable(builder.value); + this.mediaType = builder.mediaType; this.allowDuplicates = builder.allowDuplicates; } @@ -99,7 +103,7 @@ public final String field() { } /** - * Required - The value to be appended. Supports template snippets. + * The value to be appended. Supports template snippets. *

    * API name: {@code value} */ @@ -107,6 +111,18 @@ public final List value() { return this.value; } + /** + * The media type for encoding value. Applies only when value is a + * template snippet. Must be one of application/json, + * text/plain, or application/x-www-form-urlencoded. + *

    + * API name: {@code media_type} + */ + @Nullable + public final String mediaType() { + return this.mediaType; + } + /** * If false, the processor does not append values already present * in the field. @@ -133,6 +149,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { } generator.writeEnd(); + } + if (this.mediaType != null) { + generator.writeKey("media_type"); + generator.write(this.mediaType); + } if (this.allowDuplicates != null) { generator.writeKey("allow_duplicates"); @@ -153,8 +174,12 @@ public static class Builder extends ProcessorBase.AbstractBuilder ObjectBuilder { private String field; + @Nullable private List value; + @Nullable + private String mediaType; + @Nullable private Boolean allowDuplicates; @@ -169,7 +194,7 @@ public final Builder field(String value) { } /** - * Required - The value to be appended. Supports template snippets. + * The value to be appended. Supports template snippets. *

    * API name: {@code value} *

    @@ -181,7 +206,7 @@ public final Builder value(List list) { } /** - * Required - The value to be appended. Supports template snippets. + * The value to be appended. Supports template snippets. *

    * API name: {@code value} *

    @@ -192,6 +217,18 @@ public final Builder value(JsonData value, JsonData... values) { return this; } + /** + * The media type for encoding value. Applies only when value is a + * template snippet. Must be one of application/json, + * text/plain, or application/x-www-form-urlencoded. + *

    + * API name: {@code media_type} + */ + public final Builder mediaType(@Nullable String value) { + this.mediaType = value; + return this; + } + /** * If false, the processor does not append values already present * in the field. @@ -233,6 +270,7 @@ protected static void setupAppendProcessorDeserializer(ObjectDeserializer