diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexRequest.java index b957a11d3..e5f0487dc 100644 --- a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexRequest.java +++ b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexRequest.java @@ -47,6 +47,8 @@ import org.opensearch.client.opensearch._types.RequestBase; import org.opensearch.client.opensearch._types.Time; import org.opensearch.client.transport.Endpoint; +import org.opensearch.client.transport.endpoints.BooleanEndpoint; +import org.opensearch.client.transport.endpoints.BooleanResponse; import org.opensearch.client.transport.endpoints.SimpleEndpoint; import org.opensearch.client.util.ApiTypeHelper; import org.opensearch.client.util.CopyableBuilder; @@ -314,7 +316,7 @@ public DeleteDanglingIndexRequest build() { /** * Endpoint "{@code dangling_indices.delete_dangling_index}". */ - public static final Endpoint _ENDPOINT = new SimpleEndpoint<>( + public static final Endpoint _ENDPOINT = new BooleanEndpoint<>( // Request method request -> "DELETE", // Request path @@ -339,9 +341,7 @@ public DeleteDanglingIndexRequest build() { } return params; }, - SimpleEndpoint.emptyMap(), - false, - DeleteDanglingIndexResponse._DESERIALIZER + SimpleEndpoint.emptyMap() ); @Override diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexResponse.java deleted file mode 100644 index dbc7e1057..000000000 --- a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexResponse.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * - * The OpenSearch Contributors require contributions made to - * this file be licensed under the Apache-2.0 license or a - * compatible open source license. - */ - -/* - * 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. - */ - -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - -//---------------------------------------------------- -// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST. -//---------------------------------------------------- - -package org.opensearch.client.opensearch.dangling_indices; - -import java.util.function.Function; -import javax.annotation.Generated; -import javax.annotation.Nonnull; -import org.opensearch.client.json.JsonpDeserializable; -import org.opensearch.client.json.JsonpDeserializer; -import org.opensearch.client.json.ObjectBuilderDeserializer; -import org.opensearch.client.json.ObjectDeserializer; -import org.opensearch.client.opensearch._types.AcknowledgedResponseBase; -import org.opensearch.client.util.CopyableBuilder; -import org.opensearch.client.util.ObjectBuilder; -import org.opensearch.client.util.ToCopyableBuilder; - -// typedef: dangling_indices.delete_dangling_index.Response - -@JsonpDeserializable -@Generated("org.opensearch.client.codegen.CodeGenerator") -public class DeleteDanglingIndexResponse extends AcknowledgedResponseBase - implements - ToCopyableBuilder { - - // --------------------------------------------------------------------------------------------- - - private DeleteDanglingIndexResponse(Builder builder) { - super(builder); - } - - public static DeleteDanglingIndexResponse of( - Function> fn - ) { - return fn.apply(new Builder()).build(); - } - - // --------------------------------------------------------------------------------------------- - - @Override - @Nonnull - public Builder toBuilder() { - return new Builder(this); - } - - @Nonnull - public static Builder builder() { - return new Builder(); - } - - /** - * Builder for {@link DeleteDanglingIndexResponse}. - */ - public static class Builder extends AcknowledgedResponseBase.AbstractBuilder - implements - CopyableBuilder { - - public Builder() {} - - private Builder(DeleteDanglingIndexResponse o) { - super(o); - } - - private Builder(Builder o) { - super(o); - } - - @Override - @Nonnull - public Builder copy() { - return new Builder(this); - } - - @Override - @Nonnull - protected Builder self() { - return this; - } - - /** - * Builds a {@link DeleteDanglingIndexResponse}. - * - * @throws NullPointerException if some of the required fields are null. - */ - @Override - @Nonnull - public DeleteDanglingIndexResponse build() { - _checkSingleUse(); - - return new DeleteDanglingIndexResponse(this); - } - } - - // --------------------------------------------------------------------------------------------- - - /** - * Json deserializer for {@link DeleteDanglingIndexResponse} - */ - public static final JsonpDeserializer _DESERIALIZER = ObjectBuilderDeserializer.lazy( - Builder::new, - DeleteDanglingIndexResponse::setupDeleteDanglingIndexResponseDeserializer - ); - - protected static void setupDeleteDanglingIndexResponseDeserializer(ObjectDeserializer op) { - setupAcknowledgedResponseBaseDeserializer(op); - } - - @Override - public int hashCode() { - int result = super.hashCode(); - return result; - } - - @Override - public boolean equals(Object o) { - if (!super.equals(o)) { - return false; - } - if (this == o) return true; - if (o == null || this.getClass() != o.getClass()) return false; - return true; - } -} diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexRequest.java index 1193c3005..f0c1efdd2 100644 --- a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexRequest.java +++ b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexRequest.java @@ -47,6 +47,8 @@ import org.opensearch.client.opensearch._types.RequestBase; import org.opensearch.client.opensearch._types.Time; import org.opensearch.client.transport.Endpoint; +import org.opensearch.client.transport.endpoints.BooleanEndpoint; +import org.opensearch.client.transport.endpoints.BooleanResponse; import org.opensearch.client.transport.endpoints.SimpleEndpoint; import org.opensearch.client.util.ApiTypeHelper; import org.opensearch.client.util.CopyableBuilder; @@ -314,7 +316,7 @@ public ImportDanglingIndexRequest build() { /** * Endpoint "{@code dangling_indices.import_dangling_index}". */ - public static final Endpoint _ENDPOINT = new SimpleEndpoint<>( + public static final Endpoint _ENDPOINT = new BooleanEndpoint<>( // Request method request -> "POST", // Request path @@ -339,9 +341,7 @@ public ImportDanglingIndexRequest build() { } return params; }, - SimpleEndpoint.emptyMap(), - false, - ImportDanglingIndexResponse._DESERIALIZER + SimpleEndpoint.emptyMap() ); @Override diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexResponse.java deleted file mode 100644 index d76047140..000000000 --- a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexResponse.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * - * The OpenSearch Contributors require contributions made to - * this file be licensed under the Apache-2.0 license or a - * compatible open source license. - */ - -/* - * 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. - */ - -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - -//---------------------------------------------------- -// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST. -//---------------------------------------------------- - -package org.opensearch.client.opensearch.dangling_indices; - -import java.util.function.Function; -import javax.annotation.Generated; -import javax.annotation.Nonnull; -import org.opensearch.client.json.JsonpDeserializable; -import org.opensearch.client.json.JsonpDeserializer; -import org.opensearch.client.json.ObjectBuilderDeserializer; -import org.opensearch.client.json.ObjectDeserializer; -import org.opensearch.client.opensearch._types.AcknowledgedResponseBase; -import org.opensearch.client.util.CopyableBuilder; -import org.opensearch.client.util.ObjectBuilder; -import org.opensearch.client.util.ToCopyableBuilder; - -// typedef: dangling_indices.import_dangling_index.Response - -@JsonpDeserializable -@Generated("org.opensearch.client.codegen.CodeGenerator") -public class ImportDanglingIndexResponse extends AcknowledgedResponseBase - implements - ToCopyableBuilder { - - // --------------------------------------------------------------------------------------------- - - private ImportDanglingIndexResponse(Builder builder) { - super(builder); - } - - public static ImportDanglingIndexResponse of( - Function> fn - ) { - return fn.apply(new Builder()).build(); - } - - // --------------------------------------------------------------------------------------------- - - @Override - @Nonnull - public Builder toBuilder() { - return new Builder(this); - } - - @Nonnull - public static Builder builder() { - return new Builder(); - } - - /** - * Builder for {@link ImportDanglingIndexResponse}. - */ - public static class Builder extends AcknowledgedResponseBase.AbstractBuilder - implements - CopyableBuilder { - - public Builder() {} - - private Builder(ImportDanglingIndexResponse o) { - super(o); - } - - private Builder(Builder o) { - super(o); - } - - @Override - @Nonnull - public Builder copy() { - return new Builder(this); - } - - @Override - @Nonnull - protected Builder self() { - return this; - } - - /** - * Builds a {@link ImportDanglingIndexResponse}. - * - * @throws NullPointerException if some of the required fields are null. - */ - @Override - @Nonnull - public ImportDanglingIndexResponse build() { - _checkSingleUse(); - - return new ImportDanglingIndexResponse(this); - } - } - - // --------------------------------------------------------------------------------------------- - - /** - * Json deserializer for {@link ImportDanglingIndexResponse} - */ - public static final JsonpDeserializer _DESERIALIZER = ObjectBuilderDeserializer.lazy( - Builder::new, - ImportDanglingIndexResponse::setupImportDanglingIndexResponseDeserializer - ); - - protected static void setupImportDanglingIndexResponseDeserializer(ObjectDeserializer op) { - setupAcknowledgedResponseBaseDeserializer(op); - } - - @Override - public int hashCode() { - int result = super.hashCode(); - return result; - } - - @Override - public boolean equals(Object o) { - if (!super.equals(o)) { - return false; - } - if (this == o) return true; - if (o == null || this.getClass() != o.getClass()) return false; - return true; - } -} diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesAsyncClient.java b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesAsyncClient.java index 5ebdc746f..204f50196 100644 --- a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesAsyncClient.java +++ b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesAsyncClient.java @@ -45,6 +45,7 @@ import org.opensearch.client.opensearch._types.OpenSearchException; import org.opensearch.client.transport.OpenSearchTransport; import org.opensearch.client.transport.TransportOptions; +import org.opensearch.client.transport.endpoints.BooleanResponse; import org.opensearch.client.util.ObjectBuilder; /** @@ -70,7 +71,7 @@ public OpenSearchDanglingIndicesAsyncClient withTransportOptions(@Nullable Trans /** * Deletes the specified dangling index. */ - public CompletableFuture deleteDanglingIndex(DeleteDanglingIndexRequest request) throws IOException, + public CompletableFuture deleteDanglingIndex(DeleteDanglingIndexRequest request) throws IOException, OpenSearchException { return this.transport.performRequestAsync(request, DeleteDanglingIndexRequest._ENDPOINT, this.transportOptions); } @@ -80,7 +81,7 @@ public CompletableFuture deleteDanglingIndex(Delete * * @param fn a function that initializes a builder to create the {@link DeleteDanglingIndexRequest} */ - public final CompletableFuture deleteDanglingIndex( + public final CompletableFuture deleteDanglingIndex( Function> fn ) throws IOException, OpenSearchException { return deleteDanglingIndex(fn.apply(new DeleteDanglingIndexRequest.Builder()).build()); @@ -91,7 +92,7 @@ public final CompletableFuture deleteDanglingIndex( /** * Imports the specified dangling index. */ - public CompletableFuture importDanglingIndex(ImportDanglingIndexRequest request) throws IOException, + public CompletableFuture importDanglingIndex(ImportDanglingIndexRequest request) throws IOException, OpenSearchException { return this.transport.performRequestAsync(request, ImportDanglingIndexRequest._ENDPOINT, this.transportOptions); } @@ -101,7 +102,7 @@ public CompletableFuture importDanglingIndex(Import * * @param fn a function that initializes a builder to create the {@link ImportDanglingIndexRequest} */ - public final CompletableFuture importDanglingIndex( + public final CompletableFuture importDanglingIndex( Function> fn ) throws IOException, OpenSearchException { return importDanglingIndex(fn.apply(new ImportDanglingIndexRequest.Builder()).build()); diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesClient.java b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesClient.java index 131b78c59..f715b6861 100644 --- a/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesClient.java +++ b/java-client/src/generated/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesClient.java @@ -44,6 +44,7 @@ import org.opensearch.client.opensearch._types.OpenSearchException; import org.opensearch.client.transport.OpenSearchTransport; import org.opensearch.client.transport.TransportOptions; +import org.opensearch.client.transport.endpoints.BooleanResponse; import org.opensearch.client.util.ObjectBuilder; /** @@ -69,7 +70,7 @@ public OpenSearchDanglingIndicesClient withTransportOptions(@Nullable TransportO /** * Deletes the specified dangling index. */ - public DeleteDanglingIndexResponse deleteDanglingIndex(DeleteDanglingIndexRequest request) throws IOException, OpenSearchException { + public BooleanResponse deleteDanglingIndex(DeleteDanglingIndexRequest request) throws IOException, OpenSearchException { return this.transport.performRequest(request, DeleteDanglingIndexRequest._ENDPOINT, this.transportOptions); } @@ -78,7 +79,7 @@ public DeleteDanglingIndexResponse deleteDanglingIndex(DeleteDanglingIndexReques * * @param fn a function that initializes a builder to create the {@link DeleteDanglingIndexRequest} */ - public final DeleteDanglingIndexResponse deleteDanglingIndex( + public final BooleanResponse deleteDanglingIndex( Function> fn ) throws IOException, OpenSearchException { return deleteDanglingIndex(fn.apply(new DeleteDanglingIndexRequest.Builder()).build()); @@ -89,7 +90,7 @@ public final DeleteDanglingIndexResponse deleteDanglingIndex( /** * Imports the specified dangling index. */ - public ImportDanglingIndexResponse importDanglingIndex(ImportDanglingIndexRequest request) throws IOException, OpenSearchException { + public BooleanResponse importDanglingIndex(ImportDanglingIndexRequest request) throws IOException, OpenSearchException { return this.transport.performRequest(request, ImportDanglingIndexRequest._ENDPOINT, this.transportOptions); } @@ -98,7 +99,7 @@ public ImportDanglingIndexResponse importDanglingIndex(ImportDanglingIndexReques * * @param fn a function that initializes a builder to create the {@link ImportDanglingIndexRequest} */ - public final ImportDanglingIndexResponse importDanglingIndex( + public final BooleanResponse importDanglingIndex( Function> fn ) throws IOException, OpenSearchException { return importDanglingIndex(fn.apply(new ImportDanglingIndexRequest.Builder()).build()); diff --git a/java-codegen/opensearch-openapi.yaml b/java-codegen/opensearch-openapi.yaml index 6c460b019..e7a7660fb 100644 --- a/java-codegen/opensearch-openapi.yaml +++ b/java-codegen/opensearch-openapi.yaml @@ -2166,8 +2166,8 @@ paths: - $ref: '#/components/parameters/_global___query.source' - $ref: '#/components/parameters/_global___query.filter_path' responses: - '200': - $ref: '#/components/responses/dangling_indices.delete_dangling_index___200' + '202': + $ref: '#/components/responses/dangling_indices.delete_dangling_index___202' post: operationId: dangling_indices.import_dangling_index.0 x-operation-group: dangling_indices.import_dangling_index @@ -2187,8 +2187,8 @@ paths: - $ref: '#/components/parameters/_global___query.source' - $ref: '#/components/parameters/_global___query.filter_path' responses: - '200': - $ref: '#/components/responses/dangling_indices.import_dangling_index___200' + '202': + $ref: '#/components/responses/dangling_indices.import_dangling_index___202' /_data_stream: get: operationId: indices.get_data_stream.0 @@ -2803,6 +2803,7 @@ paths: externalDocs: url: https://opensearch.org/docs/latest parameters: + - $ref: '#/components/parameters/ingest.processor_grok___query.s' - $ref: '#/components/parameters/_global___query.pretty' - $ref: '#/components/parameters/_global___query.human' - $ref: '#/components/parameters/_global___query.error_trace' @@ -21662,6 +21663,13 @@ components: style: form x-version-deprecated: '2.0' x-deprecation-message: To promote inclusive language, use `cluster_manager_timeout` instead. + ingest.processor_grok___query.s: + name: s + in: query + description: Sort returned patterns by key name. + schema: + type: boolean + default: false ingest.put_pipeline___path.id: in: path name: id @@ -27560,7 +27568,7 @@ components: type: object properties: ignore_unavailable: - description: If `true`, the request ignores data streams and indexes in `indices` that are missing or closed. If `false`, the request returns an error for any data stream or index that is missing or closed. + description: If `true`, the request ignores data streams and indexes in `indexes` that are missing or closed. If `false`, the request returns an error for any data stream or index that is missing or closed. type: boolean include_global_state: description: If `true`, the current cluster state is included in the snapshot. The cluster state includes persistent cluster settings, composable index templates, legacy index templates, ingest pipelines, and ILM policies. It also includes data stored in system indexes, such as Watches and task records (configurable with `feature_states`). @@ -27601,30 +27609,67 @@ components: schema: type: object properties: - feature_states: - type: array - items: - type: string ignore_index_settings: + description: A comma-delimited list of index settings that you don't want to restore from a snapshot. type: array items: type: string ignore_unavailable: type: boolean + description: How to handle data streams or indexes that are missing or closed. If `false`, the request returns an error for any data stream or index that is missing or closed. If `true`, the request ignores data streams and indexes in indexes that are missing or closed. Defaults to `false`. include_aliases: type: boolean + description: How to handle index aliases from the original snapshot. If `true`, index aliases from the original snapshot are restored. If `false`, aliases along with associated indexes are not restored. Defaults to `true`. include_global_state: type: boolean + description: Whether to restore the current cluster state. If `false`, the cluster state is not restored. If true, the current cluster state is restored. Defaults to `false`. index_settings: + description: A comma-delimited list of settings to add or change in all restored indexes. Use this parameter to override index settings during snapshot restoration. For data streams, these index settings are applied to the restored backing indexes. $ref: '#/components/schemas/indices._common___IndexSettings' indices: + description: A comma-delimited list of data streams and indexes to restore from the snapshot. Multi-index syntax is supported. By default, a restore operation includes all data streams and indexes in the snapshot. If this argument is provided, the restore operation only includes the data streams and indexes that you specify. $ref: '#/components/schemas/_common___Indices' partial: type: boolean + description: |- + How the restore operation will behave if indexes in the snapshot do not have all primary shards available. + If `false`, the entire restore operation fails if any indexes in the snapshot do not have all primary shards available. + If `true`, allows the restoration of a partial snapshot of indexes with unavailable shards. Only shards that were successfully included in the snapshot are restored. All missing shards are recreated as empty. By default, the entire restore operation fails if one or more indexes included in the snapshot do not have all primary shards available. To change this behavior, set `partial` to `true`. + Defaults to `false`. rename_pattern: type: string + description: |- + The pattern to apply to the restored data streams and indexes. Data streams and indexes matching the rename pattern will be renamed according to the `rename_replacement` setting. + The rename pattern is applied as defined by the regular expression that supports referencing the original text. + The request fails if two or more data streams or indexes are renamed into the same name. + If you rename a restored data stream, its backing indexes are also renamed. For example, if you rename the logs data stream to `recovered-logs`, the backing index `.ds-logs-1` is renamed to `.ds-recovered-logs-1`. + If you rename a restored stream, ensure an index template matches the new stream name. If there are no matching index template names, the stream cannot roll over and new backing indexes are not created. rename_replacement: type: string + description: The rename replacement string. + rename_alias_pattern: + x-version-added: '2.18' + type: string + description: |- + The pattern to apply to the restored aliases. Aliases matching the rename pattern will be renamed according to the `rename_alias_replacement` setting. + The rename pattern is applied as defined by the regular expression that supports referencing the original text. + If two or more aliases are renamed into the same name, these aliases will be merged into one. + rename_alias_replacement: + x-version-added: '2.18' + type: string + description: The rename replacement string for aliases. + source_remote_store_repository: + x-version-added: '2.10' + type: string + description: The name of the remote store repository of the source index being restored. If not provided, the Snapshot Restore API will use the repository that was registered when the snapshot was created. + storage_type: + x-version-added: '2.7' + type: string + description: |- + Where will be the authoritative store of the restored indexes' data. + A value of `local` indicates that all snapshot metadata and index data will be downloaded to local storage. + A value of `remote_snapshot` indicates that snapshot metadata will be downloaded to the cluster, but the remote repository will remain the authoritative store of the index data. Data will be downloaded and cached as necessary to service queries. At least one node in the cluster must be configured with the search role in order to restore a snapshot using the type `remote_snapshot`. + Defaults to `local`. description: Details of what to restore sql.close: content: @@ -28409,13 +28454,13 @@ components: schema: $ref: '#/components/schemas/_common___WriteResponseBase' description: '' - dangling_indices.delete_dangling_index___200: + dangling_indices.delete_dangling_index___202: content: application/json: schema: $ref: '#/components/schemas/_common___AcknowledgedResponseBase' description: '' - dangling_indices.import_dangling_index___200: + dangling_indices.import_dangling_index___202: content: application/json: schema: @@ -51947,8 +51992,7 @@ components: _source: description: JSON body for the document. type: object - additionalProperties: - type: object + additionalProperties: true _version: $ref: '#/components/schemas/_common___StringifiedVersionNumber' _version_type: